Fixing Dockerfile and upgrade packages (#48)

* Fixing dockerfile and upgrade packages * Fixed frontend jwt issue

Author: chrisleekr

api/composer.lock

@@ -41,7 +41,6 @@ Icon?
 Thumbs.db
 
 # Dist #
-dist
 .awcache
 .webpack.json
 compiled

backend/.dockerignore

@@ -1,46 +1,36 @@
 #################################
-# STEP 1: Build
+# STEP 1: NPM install
 #################################
-FROM node:12.10.0-alpine as build
+FROM node:13-alpine as initial-stage
 
-# Create app folder
-RUN mkdir /app
-WORKDIR /app
+WORKDIR /srv
 
-# Add path
-ENV PATH /app/node_modules/.bin:$PATH
+COPY package*.json ./
 
-# Copy package*.json to app folder
-COPY package.json package-lock.json /app/
-
-# Install app dependencies
-RUN npm set progress=false
 RUN npm install
 
-# Copy all files to app folder
-COPY . /app
+#################################
+# STEP 2: Build
+#################################
+FROM initial-stage AS build-stage
+
+WORKDIR /srv
+
+COPY . .
 
-# Build the app
 RUN npm run build -- --prod --build-optimizer
 
 #################################
-# STEP 2: Deployment
+# STEP 3: Deployment
 #################################
-FROM nginx:1.13.9-alpine
+FROM nginx:stable-alpine AS production-stage
 
-# Add configuration files
 COPY image-files/ /
 
-RUN chmod 700 /usr/local/bin/docker-entrypoint.sh
-
-# Add path
-ENV PATH /usr/local/bin:$PATH
+COPY --from=build-stage /srv/dist /srv
 
-# Copy dist files from build step
-COPY --from=build /app/dist /srv/
-
-# Expose port 80
 EXPOSE 80
 
-# Run entry point
-CMD ["docker-entrypoint.sh"]
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+CMD ["nginx", "-g", "daemon off;"]

backend/Dockerfile

@@ -1,30 +1,27 @@
 #################################
 # Development
 #################################
-FROM node:12.10.0-alpine as build
+FROM node:13-alpine as build-stage
 
-# Create app folder
-RUN mkdir /app
 WORKDIR /app
 
-# Copy package*.json to app folder
-COPY package.json package-lock.json /app/
+COPY package*.json ./
 
 # Install app dependencies
 RUN npm install -g @angular/cli
 RUN npm set progress=false
 RUN npm install
 
 # Copy all files to app folder
-COPY . /app
+COPY . .
 
 # Add configuration files
 COPY image-files/ /
-RUN chmod 700 /usr/local/bin/docker-entrypoint-dev.sh
 
 # Install nginx
 RUN apk --update add nginx
 
 # Expose port 80
 EXPOSE 80
+
 ENTRYPOINT ["docker-entrypoint-dev.sh"]

backend/Dockerfile.dev

@@ -1,5 +1,10 @@
 #!/bin/sh
 
-printf "Starting nginx...\n\n"
-nginx -g "daemon off;"
+echo ' _____ .__ '
+echo ' / _ \ ____ ____ __ __| | _____ _______ '
+echo ' / /_\ \ / \ / ___\| | \ | \__ \\_ __ \'
+echo '/ | \ | \/ /_/ > | / |__/ __ \| | \/'
+echo '\____|__ /___| /\___ /|____/|____(____ /__| '
+echo ' \/ \//_____/ \/ '
 
+exec "$@"