simplify Dockerfile, logging added to setup project

Author: CrowdHailer

integration/Dockerfile

@@ -2,26 +2,14 @@ FROM elixir:1.6.1
 
 RUN apt-get update && apt-get install -y inotify-tools
 
-ARG CONTAINER_USER='elixir'
-
-ARG APP_DIR=/home/"${CONTAINER_USER}"/app
-
-# RUN useradd -m -u 1000 -s /usr/bin/bash "${CONTAINER_USER}"
-
-# USER "${CONTAINER_USER}"
-
-WORKDIR "${APP_DIR}"
+WORKDIR "/opt/app"
 
 RUN mix local.hex --force && mix local.rebar --force
-# TODO get + build deps
 
-COPY . ./
+# NOTE integration project has no config files to COPY
+COPY mix.exs mix.lock ./
+RUN mix do deps.get, deps.compile
 
-# Cleartext port
-EXPOSE 8080
-# Secure port
-EXPOSE 8443
-# Wobserver port
-EXPOSE 4001
+COPY . ./
 
-CMD ["sh", "bin/start"]
+CMD ["mix", "test"]

www/Dockerfile

@@ -2,18 +2,14 @@ FROM elixir:1.6.1
 
 RUN apt-get update && apt-get install -y inotify-tools
 
-ARG CONTAINER_USER='elixir'
-
-ARG APP_DIR=/home/"${CONTAINER_USER}"/app
-
-# RUN useradd -m -u 1000 -s /usr/bin/bash "${CONTAINER_USER}"
-
-# USER "${CONTAINER_USER}"
-
-WORKDIR "${APP_DIR}"
+WORKDIR "/opt/app"
 
 RUN mix local.hex --force && mix local.rebar --force
 
+COPY config/* config/
+COPY mix.exs mix.lock ./
+RUN mix do deps.get, deps.compile
+
 COPY . ./
 
 CMD ["sh", "bin/start"]

www/lib/www.ex

@@ -1,7 +1,7 @@
 defmodule WWW do
-  use Raxx.Server
-
+  
   @external_resource "lib/www.apib"
   use Raxx.ApiBlueprint, "./www.apib"
   use Raxx.Static, "./public"
+  use Raxx.Logger
 end