Merge with development

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 INESC-ID
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docker-compose.yml

@@ -47,22 +47,10 @@ services:
       - spring-api
     ports:
       - 8081:80
-      # - 443:443
     restart: unless-stopped
     volumes:
-      - ./scripts/nginx.conf:/etc/nginx/nginx.conf
+      - ./scripts/localhost-nginx.conf:/etc/nginx/nginx.conf
       - ./scripts/error.log:/var/log/nginx/error.log
       - ./scripts/access.log:/var/log/nginx/access.log
-      # - ./scripts/certbot/conf:/etc/letsencrypt
-      # - ./scripts/certbot/www:/var/www/certbot
     env_file:
-      - ./scripts/env/frontend.dev.env
-  #   command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-
-  # certbot:
-  #   image: certbot/certbot
-  #   restart: unless-stopped
-  #   volumes:
-  #     - ./scripts/certbot/conf:/etc/letsencrypt
-  #     - ./scripts/certbot/www:/var/www/certbot
-  #   entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
+      - ./scripts/env/frontend.dev.env

frontend/.gitignore

@@ -20,3 +20,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+*.iml

frontend/.npmrc

@@ -0,0 +1,2 @@
+// https://stackoverflow.com/questions/29349684/how-can-i-specify-the-required-node-js-version-in-package-json
+engine-strict=true

frontend/Dockerfile

@@ -1,6 +1,6 @@
-## build stage
+## Build stage
 
-FROM node:lts-alpine as build-stage
+FROM node:10-alpine as build-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
@@ -9,7 +9,7 @@ ARG NODE_ENV
 RUN if [ "$NODE_ENV" = "dev" ] ; then npm run build:dev ; else npm run build ; fi
 
 
-## production stage
+## Production stage
 
 FROM nginx:stable-alpine as production-stage
 RUN mkdir /app