Merge pull request #48 from suchyba/32-fix-api-url-to-use-parameter-w…

…hile-starting-container

32 fix api url to use parameter while starting container

.github/workflows/build-docker-image.yml

@@ -37,8 +37,7 @@ jobs:
        images: ${{ inputs.REGISTRY }}/${{ inputs.IMAGE_NAME }}
        tags: |
           type=semver,pattern={{version}},enable=${{ !inputs.DEV_RELEASE }}
-          type=raw,value=lastest,enabled=${{ !inputs.DEV_RELEASE }}
-          type=raw,value=lastest-DEV,enabled=${{ inputs.DEV_RELEASE }}
+          type=raw,value=latest-DEV,enabled=${{ inputs.DEV_RELEASE }}
           type=sha,prefix=DEV-,format=short,enable=${{ inputs.DEV_RELEASE }}
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2

Dockerfile

@@ -1,6 +1,7 @@
 FROM node:latest as node
 WORKDIR /app
 EXPOSE 443
+EXPOSE 80
 
 #Build app
 COPY package*.json /app/
@@ -12,4 +13,7 @@ RUN npm run build -- --output-path=./dist/out --configuration $configuration
 #Copy app to nginx
 FROM nginx:alpine
 COPY --from=node /app/dist/out/ /usr/share/nginx/html
-COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf
+COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf
+
+# When the container starts, replace the env.js with values from environment variables
+CMD ["/bin/sh",  "-c",  "envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && exec nginx -g 'daemon off;'"]

angular.json

@@ -105,5 +105,8 @@
       }
     }
   },
-  "defaultProject": "GroupBy.Web.App"
+  "defaultProject": "GroupBy.Web.App",
+  "cli": {
+    "analytics": false
+  }
 }

nginx-custom.conf

@@ -1,3 +1,8 @@
+server {
+	listen 80 default_server;
+	return 301 https://$host$request_uri;
+}
+
 server {
   listen 443 ssl;
   ssl_certificate     /etc/nginx/certs/server.crt;