diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9190b47..167aa17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,6 @@ docker-build: - if: $CI_COMMIT_BRANCH exists: - Dockerfile - when: manual + #when: manual tags: - OLYMPUS diff --git a/Dockerfile b/Dockerfile index 42d7bfd..a4db402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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;"] \ No newline at end of file diff --git a/default.conf b/default.conf index 8860720..df2cf29 100644 --- a/default.conf +++ b/default.conf @@ -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 _;