diff --git a/Dockerfile b/Dockerfile index a405a3d..e496ecc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM erlang:alpine # Set working directory -RUN mkdir -p /buildroot/rebar3/bin +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application diff --git a/README.md b/README.md index 9f0515b..06939b4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ We use the following Dockerfile, containing two build stages: FROM erlang:alpine # Set working directory -RUN mkdir -p /buildroot/rebar3/bin +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application @@ -31,7 +31,6 @@ COPY dockerwatch dockerwatch WORKDIR dockerwatch RUN rebar3 as prod release - # Build stage 1 FROM alpine @@ -62,10 +61,8 @@ This is what happens: #### 1. Build stage 0: build This step starts from the official erlang docker image based on alpine -linux. So with the base image, a full Erlang/OTP installation already -exists. - -To be able to build our Erlang application, we now install rebar3. +linux. So with the base image, a full Erlang/OTP installation and rebar3 +already exists. Our Erlang application is found in the `dockerwatch` directory on our local filesystem, and we use the `COPY` command to import this diff --git a/advanced_examples/elk/Dockerfile b/advanced_examples/elk/Dockerfile index e2f1c7e..e496ecc 100644 --- a/advanced_examples/elk/Dockerfile +++ b/advanced_examples/elk/Dockerfile @@ -1,15 +1,8 @@ # Build stage 0 FROM erlang:alpine -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - -# Reset working directory +# Set working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application @@ -19,7 +12,6 @@ COPY dockerwatch dockerwatch WORKDIR dockerwatch RUN rebar3 as prod release - # Build stage 1 FROM alpine diff --git a/advanced_examples/logstash/Dockerfile b/advanced_examples/logstash/Dockerfile index e2f1c7e..55b5b82 100644 --- a/advanced_examples/logstash/Dockerfile +++ b/advanced_examples/logstash/Dockerfile @@ -1,15 +1,8 @@ # Build stage 0 FROM erlang:alpine -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - -# Reset working directory +# Set working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application diff --git a/advanced_examples/minikube-dist/Dockerfile b/advanced_examples/minikube-dist/Dockerfile index e2f1c7e..65f766d 100644 --- a/advanced_examples/minikube-dist/Dockerfile +++ b/advanced_examples/minikube-dist/Dockerfile @@ -1,15 +1,8 @@ # Build stage 0 FROM erlang:alpine -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - # Reset working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application diff --git a/advanced_examples/minikube-dist/Dockerfile.backend b/advanced_examples/minikube-dist/Dockerfile.backend index 130481e..9db1d60 100644 --- a/advanced_examples/minikube-dist/Dockerfile.backend +++ b/advanced_examples/minikube-dist/Dockerfile.backend @@ -1,15 +1,8 @@ # Build stage 0 FROM erlang:alpine -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - -# Reset working directory +# Set working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application diff --git a/advanced_examples/minikube-prom-graf/Dockerfile b/advanced_examples/minikube-prom-graf/Dockerfile index 21b5c9d..ceef547 100644 --- a/advanced_examples/minikube-prom-graf/Dockerfile +++ b/advanced_examples/minikube-prom-graf/Dockerfile @@ -5,15 +5,8 @@ FROM erlang:alpine RUN apk add --no-cache g++ && \ apk add --no-cache make -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - # Reset working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application diff --git a/advanced_examples/minikube-simple/Dockerfile b/advanced_examples/minikube-simple/Dockerfile index e2f1c7e..55b5b82 100644 --- a/advanced_examples/minikube-simple/Dockerfile +++ b/advanced_examples/minikube-simple/Dockerfile @@ -1,15 +1,8 @@ # Build stage 0 FROM erlang:alpine -# Install Rebar3 -RUN mkdir -p /buildroot/rebar3/bin -ADD https://s3.amazonaws.com/rebar3/rebar3 /buildroot/rebar3/bin/rebar3 -RUN chmod a+x /buildroot/rebar3/bin/rebar3 - -# Setup Environment -ENV PATH=/buildroot/rebar3/bin:$PATH - -# Reset working directory +# Set working directory +RUN mkdir /buildroot WORKDIR /buildroot # Copy our Erlang test application