Skip to content
Snippets Groups Projects
Commit fb9ea583 authored by Henrik's avatar Henrik
Browse files

fix: fix 11

parent 9aa2a5f7
No related branches found
No related tags found
1 merge request!91Feat/deployment
Pipeline #283743 passed with warnings
......@@ -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
......@@ -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
events {
worker_processes auto;
error_log /var/log/nginx/error.log notice;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
}
http {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment