diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aeb03549ad57ef5935f6b4730ea615a031519251..df7895f2a7d38294e78af3d44195d021807f5c73 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 pull registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend && docker run -d -p 82: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 --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 dcf09d65535a6e55c7e45afa6554fa8062b8081d..25e704e6b5e39ddf6e9bad10be34a476701dd47f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,5 +10,5 @@ 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 -EXPOSE 5173 +EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index 36c61875691ce720ebf98971095b49d1f25f43a2..82dea2695f1eca5f72c9a8f00421521e7e245da4 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,6 +6,9 @@ import vueJsx from '@vitejs/plugin-vue-jsx' // https://vitejs.dev/config/ export default defineConfig({ + server: { + port: 80, + }, plugins: [ vue(), vueJsx(),