From d6bec594f435e108c96585f66c3f332582ec822d Mon Sep 17 00:00:00 2001 From: Brian Pearce Date: Thu, 12 Dec 2019 23:21:06 +0100 Subject: [PATCH] chore(Docker): Rename and fixup docker files --- .clog.toml | 1 + dev.dockerfile => nix.dockerfile | 17 ++++++++++++++--- osx.dockerfile | 2 -- 3 files changed, 15 insertions(+), 5 deletions(-) rename dev.dockerfile => nix.dockerfile (60%) diff --git a/.clog.toml b/.clog.toml index 55809ee..e3fc949 100644 --- a/.clog.toml +++ b/.clog.toml @@ -8,3 +8,4 @@ Improvements = ["impr", "im", "imp"] Documentation = ["docs"] Deprecations = ["depr"] Examples = ["examples"] +Refactor = ["ref", "refactor"] diff --git a/dev.dockerfile b/nix.dockerfile similarity index 60% rename from dev.dockerfile rename to nix.dockerfile index ebf7911..f5c5d4a 100644 --- a/dev.dockerfile +++ b/nix.dockerfile @@ -1,7 +1,7 @@ FROM rustlang/rust:nightly +ENV TMUX_VERSION 3.0a WORKDIR /usr/src -RUN USER=root cargo init # This is a dummy build to get the dependencies cached COPY . . @@ -9,8 +9,19 @@ RUN cargo fetch --target x86_64-unknown-linux-gnu RUN rm -rf ./* RUN apt-get update && \ - apt install -y tmux && \ - apt install -y locales + apt-get install -y libevent-dev \ + locales \ + bison \ + byacc && \ + apt-get remove tmux + +RUN git clone https://github.com/tmux/tmux.git /opt/tmux && \ + cd /opt/tmux && \ + git checkout $TMUX_VERSION && \ + sh autogen.sh && \ + ./configure --prefix=/opt/tmux && make && make install + +ENV PATH $PATH:/opt/tmux/bin RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ locale-gen diff --git a/osx.dockerfile b/osx.dockerfile index e4625b4..f031615 100644 --- a/osx.dockerfile +++ b/osx.dockerfile @@ -19,6 +19,4 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -RUN rustup component add rustfmt -RUN rustup component add clippy --toolchain=nightly || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy RUN cargo install clog-cli