dockerfile updated
This commit is contained in:
@@ -42,6 +42,6 @@ docker-build:
|
||||
- if: $CI_COMMIT_BRANCH
|
||||
exists:
|
||||
- Dockerfile
|
||||
when: manual
|
||||
#when: manual
|
||||
tags:
|
||||
- OLYMPUS
|
||||
|
||||
@@ -15,13 +15,11 @@ RUN npm install
|
||||
|
||||
COPY . ./
|
||||
|
||||
FROM builder as prod-builder
|
||||
RUN npm run build
|
||||
|
||||
# it's a good idea to pin this, but for demo purposes we'll leave it as is
|
||||
FROM nginx:latest as prod
|
||||
|
||||
COPY --from=prod-builder /usr/src/app/dist /usr/share/nginx/html
|
||||
COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
|
||||
ADD default.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
@@ -5,7 +5,7 @@ server {
|
||||
|
||||
#access_log /var/log/nginx/host.access.log main;
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
index index.html index.html;
|
||||
|
||||
server_name _;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user