diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 077b8fc9ded3a10fe4807e56efbdf834c24c9393..15c7862697f8cbe9beaa0bc0c1e500cfe1955ff8 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 --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 run -d --name -p 80:5173 frontend registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend" when: manual \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a2ef3164391d4f75542e653dc17b1ff606b0433a..a3c731271d82dce30d69e405b086723d9c50935a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,10 @@ RUN npm install COPY . . RUN npm run build -# Step 2: Setup the server with Nginx -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 -EXPOSE 5173 +# Step 2: Setup the server with Nginx +#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 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +#CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/web/nginx.conf b/web/nginx.conf index 5f7a53b946e72d5c0f5a1e289d9fcc9f6cb7d712..8c8fc61a22becdc52e6d029b124bab709b0301c6 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -1,5 +1,10 @@ -events { +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; +events { + worker_connections 1024; } http {