Skip to content

Commit

Permalink
hotfix: add https
Browse files Browse the repository at this point in the history
  • Loading branch information
Hellol77 committed Jun 28, 2024
1 parent 5eadca2 commit 1776da5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/waggle-service-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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;"]
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ services:
dockerfile: Dockerfile
ports:
- "80:80"
- "443:443"
stdin_open: true
11 changes: 11 additions & 0 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 1776da5

Please sign in to comment.