From 175f306d384fdf52dba42dac0c82eb236f7c8b49 Mon Sep 17 00:00:00 2001
From: henridb <henridb@stud.ntnu.no>
Date: Fri, 3 May 2024 08:39:52 +0200
Subject: [PATCH] fix: fix 21
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
vite.config.ts | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aeb0354..df7895f 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 dcf09d6..25e704e 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 36c6187..82dea26 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(),
--
GitLab