Skip to content

Commit

Permalink
chore(Docker): Rename and fixup docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
brianp committed Dec 12, 2019
1 parent 685e399 commit d6bec59
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
1 change: 1 addition & 0 deletions .clog.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Improvements = ["impr", "im", "imp"]
Documentation = ["docs"]
Deprecations = ["depr"]
Examples = ["examples"]
Refactor = ["ref", "refactor"]
17 changes: 14 additions & 3 deletions dev.dockerfile → nix.dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
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 . .
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
Expand Down
2 changes: 0 additions & 2 deletions osx.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d6bec59

Please sign in to comment.