Merge branch 'fix-docker-setup' into register_module

Author: roschaefer

.dockerignore

@@ -5,5 +5,6 @@ node_modules/
 build/
 npm-debug.log
 Dockerfile
-.env
+docker-compose*.yml
 .env-secrets
+.env

.env.example

@@ -0,0 +1,18 @@
+# WEBAPP
+WEBAPP_HOST        = localhost
+WEBAPP_PORT        = 3000
+WEBAPP_BASE_URL    = http://localhost:3000
+
+# API
+API_HOST           = localhost
+API_PORT           = 3030
+
+# METAAPI
+EMBED_API_URL      = http://localhost:3050
+
+# 3rd party integrations
+SENTRY_DNS_PUBLIC  =
+MAPBOX_TOKEN       = pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+
+# MAINTENANCE
+MAINTENANCE        =

.env.tmp

@@ -27,7 +27,6 @@ npm-debug.log
 /nbproject/private/
 /nbproject/
 
-# .env and .env-secrets
 .env
 .env-secrets
 

.gitignore

@@ -1,25 +1,26 @@
 language: node_js
 node_js:
-  - "8"
+  - "10"
 services:
   - docker
 cache:
   yarn: true
   directories:
     - node_modules
 
-install:
-  # nothing
+# install current version of yarn
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH="$HOME/.yarn/bin:$PATH"
 
 jobs:
   include:
     - stage: Test and Build
       script:
       - yarn install --frozen-lockfile --non-interactive
-      - yarn test:env
-      - yarn test
+      - yarn run ci
     - script:
-      - docker build -t humanconnection/frontend-nuxt .
+      - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/frontend-nuxt .
 
 after_success:
   - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then

.travis.yml

@@ -1,46 +1,26 @@
-FROM node:8.9-alpine
-LABEL Description="This image is used to start the hc-frontend-nuxt" Vendor="Human-Connection gGmbH" Version="1.0" Maintainer="Human-Connection gGmbH ([email protected])"
-
-# update unix packages
-RUN apk update && apk upgrade
-RUN apk add git
-RUN rm -rf /var/cache/apk/*
-
-# install global dependencies
-RUN yarn global add pm2 envsub
+FROM node:10-alpine
+LABEL Description="This image builds and runs the Human-Connection Frontend" Vendor="Human-Connection gGmbH" Version="1.0" Maintainer="Human-Connection gGmbH ([email protected])"
 
 # expose the app port
 EXPOSE 3000
 
-# set environment variables
-ENV HOST=0.0.0.0
-ENV WEBAPP_HOST=0.0.0.0
-
-ENTRYPOINT ["./entrypoint.sh"]
-
-# create working directory
-RUN mkdir -p /var/www/
-WORKDIR /var/www/
-
-# install app dependencies
-COPY package.json /var/www/
-COPY yarn.lock /var/www/
-RUN yarn install --frozen-lockfile --non-interactive
-
-# copy the code to the docker image
-COPY . /var/www/
+# optional git commit hash
+ARG BUILD_COMMIT
+ENV BUILD_COMMIT=$BUILD_COMMIT
+ENV NODE_ENV=production
 
-# set execution rights on scripts and run the build script
-RUN chmod +x entrypoint.sh
-RUN chmod +x scripts/on-build.sh
-RUN chmod +x scripts/on-start.sh
-RUN sh scripts/on-build.sh
+RUN mkdir -p /WebApp/
+WORKDIR /WebApp/
+# --no-cache: download package index on-the-fly, no need to cleanup afterwards
+# --virtual: bundle packages, remove whole bundle at once, when done
+RUN apk --no-cache --virtual build-dependencies add git python make g++
 
-# buld application
-# ENV NODE_ENV=production #we seam to have issues with the production flag on install && build
-RUN yarn build
+RUN yarn global add pm2
 
-ENV NODE_ENV=production
+COPY package.json /WebApp/
+COPY yarn.lock /WebApp/
+RUN yarn install --production=false --frozen-lockfile --non-interactive
 
-# only keep production dependencies
-# RUN yarn install --frozen-lockfile --non-interactive
+COPY . /WebApp/
+RUN ["yarn", "run", "build"]
+CMD ["pm2", "start", "node", "build/main.js", "-n", "frontend", "-i", "2", "--attach"]

Dockerfile

@@ -32,6 +32,12 @@ $ yarn build
 $ yarn start
 ```
 
+Create your individual set of environment variables:
+```sh
+$ cp .env.example .env
+# now open .env and change it according to your setup
+```
+
 For detailed explanation on how things work, checkout the [Nuxt.js docs](https://github.com/nuxt/nuxt.js).
 
 ## Env Vars

README.md

@@ -0,0 +1,65 @@
+version: '3'
+
+services:
+  webapp:
+    networks:
+      hc-network:
+        ipv4_address: 172.25.0.20
+    environment:
+      - NODE_ENV=development
+      - MAINTENANCE=${MAINTENANCE}
+      - WEBAPP_HOST=172.25.0.20
+      - WEBAPP_BASE_URL=http://172.25.0.20:3000
+      - API_HOST=172.25.0.11
+      - WEBAPP_PORT=3000
+      - API_PORT=3030
+      - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
+      - SENTRY_DNS_PUBLIC=${SENTRY_DNS_PUBLIC}
+      - EMBED_API_URL=${EMBED_API_URL}
+        # these secrets should only be accessible on the server:
+      - SENTRY_DNS_PRIVATE=${SENTRY_DNS_PRIVATE}
+      - EMBED_API_TOKEN=${EMBED_API_TOKEN}
+    depends_on:
+      - api
+  mongo:
+    image: mongo
+    networks:
+      - hc-network
+    command: "--smallfiles --logpath=/dev/null"
+  api:
+    image: humanconnection/api-feathers
+    depends_on:
+      - maildev
+      - thumbor
+      - mongo
+    environment:
+      - NODE_ENV=staging
+    ports:
+      - "3030:3030"
+    stdin_open: true
+    tty: true
+    networks:
+      hc-network:
+        ipv4_address: 172.25.0.11
+  maildev:
+    image: djfarrelly/maildev
+    networks:
+      - hc-network
+    ports:
+      - "1080:80"
+      - "1025:25"
+  thumbor:
+    image: apsl/thumbor
+    networks:
+      - hc-network
+    ports:
+      - "8000:8000"
+
+networks:
+  hc-network:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+      -
+        subnet: 172.25.0.0/16

docker-compose.override.yml

@@ -1,16 +1,13 @@
-version: '2'
+version: '3'
 
 services:
-  frontend:
-    build: .
-    environment:
-      WEBAPP_HOST: localhost
-      WEBAPP_PORT: 3000
-      WEBAPP_BASE_URL: http://localhost:3000
-      API_HOST: http://localhost
-      API_PORT: 3030
-      MAPBOX_TOKEN:
+  webapp:
+    image: humanconnection/frontend-nuxt
+    build:
+      context: .
+      args:
+        BUILD_COMMIT: ${BUILD_COMMIT}
     stdin_open: true
     tty: true
     ports:
-    - 3000:3000/tcp
+      - 3000:3000/tcp