Merge pull request #328 from cmu-sei/fix-entry-scripts

fix entry scripts

Author: sei-noconnor

.github/CODEOWNERS

@@ -1 +1 @@
-*       @sei-ebram @sei-tspencer @sei-chershberger @sei-aschlackman @sei-noconnor
+*       @sei-tspencer @sei-chershberger @sei-aschlackman @sei-noconnor

angular.json

@@ -13,7 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/steamfitter-web",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",

build-container.sh

@@ -1,34 +1,30 @@
-FROM node as builder
+FROM node:16-alpine as builder
 
 COPY package.json package-lock.json ./
 
-## Storing node modules on a separate layer will prevent unnecessary npm installs at each build
-RUN npm set progress=false && \
-    npm config set depth 0 && \
-    npm cache clean --force && \
-    npm config set unsafe-perm true
-
-RUN npm ci && mkdir -p /ng-app/dist/steamfitter-web && cp -R ./node_modules ./ng-app
+# Storing node modules on a separate layer will prevent unnecessary npm install at each build
+RUN npm i && mkdir -p /ng-app/dist && cp -R ./node_modules ./ng-app
 
 WORKDIR /ng-app
 
 COPY . .
 
-## Build the angular app in production mode and store the artifacts in dist folder
-RUN $(npm bin)/ng build --configuration production
+RUN $(npm bin)/ng build --resources-output-path=assets/fonts --aot --configuration production 
 
 ### Stage 2: Setup ###
 
 FROM nginxinc/nginx-unprivileged:stable-alpine
 
 USER root
 RUN rm -rf /usr/share/nginx/html/*
-USER nginx
-
 COPY default.conf /etc/nginx/conf.d/default.conf
 COPY nginx-basehref.sh /docker-entrypoint.d/90-basehref.sh
-COPY --from=builder ./ng-app/dist/steamfitter-web /usr/share/nginx/html
+COPY --from=builder /ng-app/dist /usr/share/nginx/html
+RUN chown -R nginx:nginx /usr/share/nginx/html && \
+  chmod +x /docker-entrypoint.d/90-basehref.sh
+USER nginx
 
 EXPOSE 8080
 
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

docker-compose.yml

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
-src=/var/www
+
+src=/usr/share/nginx/html
 basehref=`echo $APP_BASEHREF | sed -e s,^/,, -e s,/$,,`
 if [ -n "$basehref" ]; then
   sed -i "s,base\ href=\"/\",base\ href=\"/$basehref/\"," $src/index.html