diff --git a/.github/workflows/waggle-service-deploy.yml b/.github/workflows/waggle-service-deploy.yml index 93e263c0..64170ade 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 80:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service + docker run -d -p 80:80 -p 443:443 --name "${{ secrets.DOCKER_CONTAINER_NAME }}" -v /etc/letsencrypt:/etc/letsencrypt ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service - name: Remove Github Actions IP from security group run: | diff --git a/Dockerfile b/Dockerfile index 864ac423..7875b533 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,6 @@ FROM node:19-alpine AS Release WORKDIR /app COPY --from=builder /usr/src/app/packages/waggle-service/dist /app/packages/waggle-service/dist -# COPY --from=builder /usr/src/app/packages/waggle-service/package.json /app/packages/waggle-service/package.json -# COPY --from=builder /usr/src/app/.pnp.cjs /app/.pnp.cjs -# COPY --from=builder /usr/src/app/.yarnrc.yml /app/.yarnrc.yml -# COPY --from=builder /usr/src/app/.yarn /app/.yarn -# COPY --from=builder /usr/src/app/package.json /app/package.json -# COPY --from=builder /usr/src/app/yarn.lock /app/yarn.lock FROM nginx:latest @@ -31,4 +25,6 @@ RUN rm -rf ./usr/share/nginx/html/* COPY --from=Release /app/packages/waggle-service/dist ./usr/share/nginx/html/ EXPOSE 80 +EXPOSE 443 + ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml index d20cced2..d26a32f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,5 @@ services: dockerfile: Dockerfile ports: - "80:80" + - "443:443" stdin_open: true diff --git a/nginx/nginx.conf b/nginx/nginx.conf index dfd1fded..41a1cceb 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -2,9 +2,20 @@ server { listen 80; server_name waggle-pet.com; + location / { + return 301 https://$host$request_uri; + } +} +server { + listen 443 ssl; + server_name waggle-pet.com; + root /usr/share/nginx/html; index index.html; + ssl_certificate /etc/letsencrypt/live/waggle-pet.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/waggle-pet.com/privkey.pem; + location / { try_files $uri $uri/ /index.html; }