Skip to content

Commit 1776da5

Browse files
committed
hotfix: add https
1 parent 5eadca2 commit 1776da5

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

.github/workflows/waggle-service-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
docker stop ${{secrets.DOCKER_CONTAINER_NAME}}
7979
docker rm ${{secrets.DOCKER_CONTAINER_NAME}}
8080
docker pull ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service
81-
docker run -d -p 80:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service
81+
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
8282
8383
- name: Remove Github Actions IP from security group
8484
run: |

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ FROM node:19-alpine AS Release
1313
WORKDIR /app
1414

1515
COPY --from=builder /usr/src/app/packages/waggle-service/dist /app/packages/waggle-service/dist
16-
# COPY --from=builder /usr/src/app/packages/waggle-service/package.json /app/packages/waggle-service/package.json
17-
# COPY --from=builder /usr/src/app/.pnp.cjs /app/.pnp.cjs
18-
# COPY --from=builder /usr/src/app/.yarnrc.yml /app/.yarnrc.yml
19-
# COPY --from=builder /usr/src/app/.yarn /app/.yarn
20-
# COPY --from=builder /usr/src/app/package.json /app/package.json
21-
# COPY --from=builder /usr/src/app/yarn.lock /app/yarn.lock
2216

2317
FROM nginx:latest
2418

@@ -31,4 +25,6 @@ RUN rm -rf ./usr/share/nginx/html/*
3125
COPY --from=Release /app/packages/waggle-service/dist ./usr/share/nginx/html/
3226

3327
EXPOSE 80
28+
EXPOSE 443
29+
3430
ENTRYPOINT ["nginx", "-g", "daemon off;"]

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ services:
88
dockerfile: Dockerfile
99
ports:
1010
- "80:80"
11+
- "443:443"
1112
stdin_open: true

nginx/nginx.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,20 @@ server {
22
listen 80;
33
server_name waggle-pet.com;
44

5+
location / {
6+
return 301 https://$host$request_uri;
7+
}
8+
}
9+
server {
10+
listen 443 ssl;
11+
server_name waggle-pet.com;
12+
513
root /usr/share/nginx/html;
614
index index.html;
715

16+
ssl_certificate /etc/letsencrypt/live/waggle-pet.com/fullchain.pem;
17+
ssl_certificate_key /etc/letsencrypt/live/waggle-pet.com/privkey.pem;
18+
819
location / {
920
try_files $uri $uri/ /index.html;
1021
}

0 commit comments

Comments
 (0)