Fix container issues

DanWahlin · Nov 17, 2024 · 19b0f97 · 19b0f97
1 parent d8bd2de
commit 19b0f97
Show file tree

Hide file tree

Showing 4 changed files with 618 additions and 411 deletions.
diff --git a/.docker/nginx.dockerfile b/.docker/nginx.dockerfile
@@ -7,14 +7,14 @@ ENV NG_APP_API_URL=$NG_APP_API_URL
 
 WORKDIR /app
 COPY package.json package-lock.json ./
-RUN npm install --no-optional 
+RUN npm install
 COPY . .
 RUN npm run build
 
 ##### Stage 2
 FROM nginx:alpine
 VOLUME /var/cache/nginx
-COPY --from=node /app/dist /usr/share/nginx/html
+COPY --from=node /app/dist/angular-jumpstart /usr/share/nginx/html
 COPY ./.docker/config/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Run from project root

diff --git a/.docker/node.dockerfile b/.docker/node.dockerfile
@@ -7,11 +7,10 @@ ENV CONTAINER=true
 WORKDIR /var/www/node-service
 
 COPY package.json package-lock.json ./
-RUN npm install --only=prod --no-optional
+RUN npm install --omit=dev --omit=optional
 
 COPY ./server.js .
-COPY ./api .
-COPY ./public/data .
+COPY ./public ./public
 
 EXPOSE 8080