Bladeren bron

Merge branch 'feature/dockerize' of hostbbq/hostbbq-monitoring into master

tunefish 2 jaren geleden
bovenliggende
commit
6fd1cb912d
2 gewijzigde bestanden met toevoegingen van 6 en 5 verwijderingen
  1. 2 1
      .gitignore
  2. 4 4
      server.dockerfile

+ 2 - 1
.gitignore

@@ -16,4 +16,5 @@ server/.env
 fcm/express/google-cloud/
 fcm/express/dist/
 fcm/express/public/
-fcm/express/.env
+fcm/express/.env
+.DS_Store

+ 4 - 4
server.dockerfile

@@ -30,10 +30,10 @@ ARG APPDIR="${HOME}/monitoring"
 RUN mkdir ${APPDIR}
 WORKDIR ${APPDIR}
 
-COPY --from=build_helper ${APPDIR}/server/dist/ ./dist
-COPY --from=build_helper ${APPDIR}/server/public/ ./public
-COPY ./server/google-cloud/ ./google-cloud
-COPY ./server/package.json .
+COPY --from=build_helper --chown=node:node ${APPDIR}/server/dist/ ./dist
+COPY --from=build_helper --chown=node:node ${APPDIR}/server/public/ ./public
+COPY  --chown=node:node ./server/google-cloud/ ./google-cloud
+COPY  --chown=node:node ./server/package.json .
 
 RUN npm install --omit=dev
 COPY ./server/database.json .