diff --git a/.github/workflows/waggle-service-deploy.yml b/.github/workflows/waggle-service-deploy.yml index 4f7c2532..93e263c0 100644 --- a/.github/workflows/waggle-service-deploy.yml +++ b/.github/workflows/waggle-service-deploy.yml @@ -78,7 +78,7 @@ jobs: docker stop ${{secrets.DOCKER_CONTAINER_NAME}} docker rm ${{secrets.DOCKER_CONTAINER_NAME}} docker pull ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service - docker run -d -p 3001:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service + docker run -d -p 80:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service - name: Remove Github Actions IP from security group run: | diff --git a/Dockerfile b/Dockerfile index 0aa43644..864ac423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,5 +30,5 @@ RUN rm -rf ./usr/share/nginx/html/* COPY --from=Release /app/packages/waggle-service/dist ./usr/share/nginx/html/ -EXPOSE 3001 +EXPOSE 80 ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml index d6089d24..d20cced2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,5 +7,5 @@ services: context: . dockerfile: Dockerfile ports: - - "3001:80" + - "80:80" stdin_open: true diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 527e9ab9..dfd1fded 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,11 +1,11 @@ - server { listen 80; + server_name waggle-pet.com; + + root /usr/share/nginx/html; + index index.html; + location / { - root /usr/share/nginx/html; - index index.html index.html; try_files $uri $uri/ /index.html; - } - } diff --git a/packages/waggle-service/package.json b/packages/waggle-service/package.json index 51806239..56e2a32e 100644 --- a/packages/waggle-service/package.json +++ b/packages/waggle-service/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", - "preview": "vite preview --port 3001 --host", + "preview": "vite preview --port 80 --host", "lint": "eslint './src/**/*.{ts,tsx,js,jsx}'", "lint:fix": "eslint --fix './src/**/*.{ts,tsx,js,jsx}'", "prepare": "husky install", diff --git a/packages/waggle-service/vite.config.ts b/packages/waggle-service/vite.config.ts index 49af4760..4aa0c1fb 100644 --- a/packages/waggle-service/vite.config.ts +++ b/packages/waggle-service/vite.config.ts @@ -29,7 +29,7 @@ export default defineConfig({ base: "/", server: { host: true, - port: 3001, + port: 80, }, test: { globals: true,