Skip to content

Commit

Permalink
fix: update docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
@ralfaron
ralfaron committed Sep 9, 2024
1 parent badb5e5 commit 16ccd17
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ FROM node:lts-alpine3.19 AS aasportal
RUN apk upgrade --update-cache --available && apk add openssl && rm -rf /var/cache/apk/*
WORKDIR /usr/src/app
COPY package.json package.json
COPY projects/aas-server/package.json projects/aas-server/package.json
COPY projects/aas-server/package.json package.json
COPY projects/aas-server/src/assets assets/
RUN npm install --omit=dev
COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/aas-core/dist/
COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/aas-core/package.json
COPY --from=build /usr/src/app/projects/aas-portal/dist/browser/ /usr/src/app/wwwroot/
RUN npm install -w=aas-server --omit=dev
COPY projects/aas-server/src/assets assets/
ENV NODE_LOG=./log/debug.log
ENV NODE_SERVER_PORT=80
ENV ENDPOINTS=["\"file:///endpoints/samples?name=Samples\""]
Expand Down
9 changes: 3 additions & 6 deletions Dockerfile.aas-server
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,18 @@ FROM node:lts-alpine3.19 AS aas-server
RUN apk upgrade --update-cache --available && apk add openssl && rm -rf /var/cache/apk/*
WORKDIR /usr/src/app
COPY package.json package.json
COPY projects/aas-server/package.json projects/aas-server/package.json
COPY projects/aas-server/package.json package.json
COPY projects/aas-server/src/assets assets/
RUN npm install --omit=dev
COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/aas-core/dist/
COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/aas-core/package.json
RUN npm install -w=aas-server --omit=dev
COPY projects/aas-server/src/assets assets/
ENV NODE_LOG=./log/debug.log
ENV NODE_SERVER_PORT=1337
ENV USER_STORAGE=mongodb://172.16.160.177:27017/aasportal-users
ENV AAS_INDEX=mysql://172.16.160.177:3306
<<<<<<< HEAD
=======
ENV TEMPLATE_STORAGE: http://172.16.160.177:8080/templates
>>>>>>> acd45b6be65e2f6471beebcdadbbf8a043b25821
ENV ENDPOINTS=["\"file:///endpoints/samples?name=Samples\""]
ENV NODE_ENV=production

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 16ccd17

Please sign in to comment.