Dockerfile refactor (#157)

* Use multi-stage Dockerfile

* fixup! Use multi-stage Dockerfile

Author: rslota

.circleci/config.yml

@@ -118,6 +118,28 @@ jobs:
     steps:
       - test
 
+  build-dev-certs:
+    executor:
+      name: elixir-builder
+      env: dev
+      erlang_version: "22.0"
+      elixir_version: "1.9"
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - mix-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-${CIRCLE_JOB}-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Generate dev certs
+          command: mix certs.dev
+      - save_cache:
+          key: certs-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - priv
+
   test-erlang-22_elixir-1-8:
     executor:
       name: elixir-builder
@@ -173,7 +195,7 @@ jobs:
             - mix-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
       - run: mix format --check-formatted
 
-  build-tar-and-docker-image:
+  build-docker-image:
     executor:
       name: elixir-builder
       env: prod
@@ -184,32 +206,40 @@ jobs:
       - restore_cache:
           keys:
             - mix-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
-      - run:
-          name: Mix build release
-          command: mix do certs.dev, distillery.release
-      - save_cache:
-          key: certs-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - "priv"
-      - run:
-          name : Build tar archive
-          command: tar -czf mongoose_push.tar.gz -C _build/${MIX_ENV}/rel/mongoose_push .
       - run: *DOCKER_TAGS
       - run:
           name: Login to DockerHub
           command: docker login -u "${DOCKERHUB_USER}" -p "${DOCKERHUB_PASS}"
       - run:
           name: Build docker image
-          command: docker build -f Dockerfile.release --build-arg MIX_ENV=prod -t $DOCKERHUB_REPOSITORY/$DOCKER_IMAGE:$DOCKER_TAG .
+          command: docker build -f Dockerfile --build-arg MIX_ENV=prod -t mpush:latest .
+      - run:
+          name: Push docker image but do not tag it as the latest
+          command: docker tag mpush:latest $DOCKERHUB_REPOSITORY/$DOCKER_IMAGE:$DOCKER_TAG
       - run:
           name: Push docker image but do not tag it as the latest
           command: docker push $DOCKERHUB_REPOSITORY/$DOCKER_IMAGE:$DOCKER_TAG
+      - run:
+          name: Save Docker image layer cache
+          command: |
+            mkdir -p /tmp/caches
+            docker save -o /tmp/caches/mpush-image.tar $DOCKERHUB_REPOSITORY/$DOCKER_IMAGE:$DOCKER_TAG
+      - save_cache:
+          key: docker-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - /tmp/caches/mpush-image.tar
 
   integration-tests:
     machine:
         image: ubuntu-1604:201903-01
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - docker-cache-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Load the MongoosePush Docker image
+          command: docker load -i /tmp/caches/mpush-image.tar
       - run:
           name: Install elixir
           command: |
@@ -235,7 +265,7 @@ jobs:
           name: Setup mocks and MPush
           command: |
               export PRIV=$HOME/app/priv && \
-              docker-compose -f /home/circleci/project/test/docker/integration.yml up -d
+              docker-compose -f /home/circleci/project/test/docker/docker-compose.integration.yml up -d
       - run:
           name: Wait for FCM mock
           command: sudo dockerize -wait tcp://localhost:4001 -timeout 1m
@@ -302,14 +332,19 @@ workflows:
           requires:
             - pre-build
           filters: *all_tags
-      - build-tar-and-docker-image:
+      - build-dev-certs:
+          requires:
+            - pre-build
+          filters: *all_tags
+      - build-docker-image:
           requires:
             - pre-build
           filters: *all_tags
 
       - integration-tests:
           requires:
-            - build-tar-and-docker-image
+            - build-docker-image
+            - build-dev-certs
           filters: *all_tags
 
       - push-to-dockerhub:

Dockerfile.release DockerfileDockerfile.release renamed to Dockerfile

@@ -1,5 +1,31 @@
+FROM rslota/beam-builder:erlang-22.0_elixir-1.9 AS builder
+
+USER root
+
+WORKDIR /opt/app
+ENV HOME=/opt/app
+ENV MIX_ENV=prod
+
+COPY mix.exs mix.lock ./
+COPY config config
+COPY asn.1 asn.1
+COPY rel rel
+COPY lib lib
+COPY priv priv
+
+# Install Hex+Rebar
+RUN mix local.hex --force && \
+    mix local.rebar --force
+
+
+RUN mix deps.get
+RUN mix do certs.dev, distillery.release
+RUN tar -czf mongoose_push.tar.gz -C _build/prod/rel/mongoose_push .
+
+
 FROM debian:stretch-slim
 
+
 # set locales
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y locales
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -28,7 +54,8 @@ ENV PUSH_HTTPS_BIND_ADDR=0.0.0.0 PUSH_HTTPS_PORT=8443 MIX_ENV=prod \
 
 WORKDIR /opt/app
 
-ADD mongoose_push.tar.gz ./
+COPY --from=builder /opt/app/mongoose_push.tar.gz mongoose_push.tar.gz
+RUN tar -xf mongoose_push.tar.gz ./
 
 # Move priv dir
 RUN mv $(find lib -name mongoose_push-*)/priv .

Dockerfile.build

@@ -45,13 +45,13 @@ docker run -v `pwd`/priv:/opt/app/priv \
 Building docker is really easy, just type:
 
 ```bash
-MIX_ENV=prod mix do deps.get, certs.dev, docker.build, docker.release
+docker build . -t mpush:latest
 ```
 
-As a result of this command you get access to `mongoose_push:release` docker image. You may run it by typing:
+As a result of this command you get access to `mpush:latest` docker image. You may run it by typing:
 
 ```bash
-docker run -it --rm mongoose_push:release foreground
+docker run -it --rm mpush:latest foreground
 ```
 
 The docker image that you have just built, exposes the port `8443` for the HTTP API of MongoosePush. It contains a `VOLUME` for path */opt/app* - it is handy for injecting `APNS` and `HTTP API` certificates since by default the docker image comes with test, self-signed certificates.
@@ -138,7 +138,7 @@ Development release is by default configured to connect to local APNS / FCM mock
 in `config/dev.exs` file.
 For now, let's just start those mocks so that we can use default dev configuration:
 ```bash
-docker-compose -f test/docker/docker-compose.yml up -d
+docker-compose -f test/docker/docker-compose.unit.yml up -d
 ```
 
 After this step you may try to run the service via:
@@ -151,7 +151,7 @@ _build/dev/rel/mongoose_push/bin/mongoose_push console
 
 Setup FCM and APNS mocks first:
 ```bash
-$ docker-compose -f test/docker/docker-compose.yml up -d
+$ docker-compose -f test/docker/docker-compose.unit.yml up -d
 ```
 
 Generate certificates. This step is needed to be run only once:
@@ -166,7 +166,7 @@ $ mix test
 
 You can cleanup docker after tests by calling:
 ```bash
-$ docker-compose -f test/docker/docker-compose.yml down
+$ docker-compose -f test/docker/docker-compose.unit.yml down
 ```
 
 ## Configuration
@@ -329,7 +329,7 @@ If you specify both **alert** and **data**, target device will receive both noti
 * **429** `{"reason" : "too_many_requests"}` - there were too many requests to the server.
 * **503** `{"reason" : "service_internal"|"internal_config"|"unspecified"}` - the internal service or configuration error occured.
 * **520** `{"reason" : "unspecified"}` - the unknown error occured.
-* **500** `{"reason" : reason}` - the server internal error occured, 
+* **500** `{"reason" : reason}` - the server internal error occured,
   specified by **reason**.
 
 ## Metrics

README.md

@@ -0,0 +1,37 @@
+version: '3'
+
+services:
+  fcm-mock:
+    image: mongooseim/fcm-mock-server
+    container_name:  fcm-mock
+    ports:
+      - "4001:4001"
+  apns-mock:
+    image: mobify/apns-http2-mock-server
+    container_name: apns-mock
+    ports:
+      - "2197:2197"
+
+  mongoose-push:
+    image: mpush:latest
+    build:
+      context: ../../
+      dockerfile: Dockerfile
+
+    container_name: mongoose-push
+    environment:
+      - PUSH_APNS_ENABLED=true
+      - PUSH_APNS_PROD_ENDPOINT=apns-mock
+      - PUSH_APNS_PROD_USE_2197=true
+      - PUSH_APNS_AUTH_TYPE=certificate
+      - PUSH_APNS_DEV_ENDPOINT=apns-mock
+      - PUSH_APNS_DEV_USE_2197=true
+      - PUSH_FCM_ENABLED=true
+      - PUSH_FCM_PORT=4000
+      - PUSH_FCM_ENDPOINT=fcm-mock
+      - TLS_SERVER_CERT_VALIDATION=false
+      - FCM_AUTH_ENDPOINT=http://fcm-mock:4001
+    ports:
+      - "8443:8443"
+    volumes:
+      - ${PRIV}:/opt/app/priv

test/docker/docker-compose.integration.yml

@@ -0,0 +1,14 @@
+version: '3'
+
+services:
+  fcm-mock:
+    image: mongooseim/fcm-mock-server
+    container_name:  fcm-mock
+    ports:
+      - "4001:4001"
+      - "4000:4000"
+  apns-mock:
+    image: mobify/apns-http2-mock-server
+    container_name: apns-mock
+    ports:
+      - "2197:2197"