diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d1b100d92d2dccb66861e56fc87f58916260b63..968f8e91c0abd598de755deecc9513c2d310cee4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,5 +36,5 @@ deploy_docker: - apt-get -yqq install ssh - apt-get install sshpass script: - - sshpass -p sParest1en ssh -v -o StrictHostKeyChecking=no root@128.199.53.153 "docker rm -f frontend || true; docker run -d -p 80:5173 --name frontend registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend" + - sshpass -p sParest1en ssh -v -o StrictHostKeyChecking=no root@128.199.53.153 "docker rm -f frontend || true; docker pull registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend && docker run -d -p 80:5173 --name frontend registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend" when: manual \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1fd858e00ced8b2f42c21f1c7f1a538a2edda8da..34412fb45f34917dee1a8c1dbe444e598b45fcf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN npm run build FROM nginx:stable-alpine as production-stage COPY --from=build-stage /app/dist /usr/share/nginx/html COPY web/nginx.conf /etc/nginx/nginx.conf -COPY web/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY web/nginx-selfsigned.crt /etc/ssl/private/selfsigned.crt +COPY web/ca-certificates.crt /etc/ssl/private/ca-certificates.crt +COPY web/nginx-selfsigned.crt /etc/ssl/certs/selfsigned.crt CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file