Skip to content

Commit

Permalink
Merge pull request #56 from Korea-Certified-Store/feature/set-https(#52)
Browse files Browse the repository at this point in the history
개발서버 https 적용
  • Loading branch information
jinhoon227 authored Jan 19, 2024
2 parents 4c536ea + f17bd60 commit 1027241
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/action-develop-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
chmod +x ./gradlew
./gradlew clean build -x test
# 도커 컴포즈 설정 파일 서버(EC2)로 전달
- name: Send docker-compose.yml
# 설정 파일 서버(EC2)로 전달
- name: Send docker-compose.yml and nginx.conf
uses: appleboy/scp-action@master
with:
username: ubuntu
host: ${{ secrets.KCS_HOST_DEV }}
key: ${{ secrets.KCS_KEY_DEV }}
source: "src/main/resources/backend-submodule/docker-compose-dev.yml"
source: "src/main/resources/backend-submodule/docker-compose-dev.yml,./nginx/nginx.conf"
target: "/home/ubuntu/"

# Docker hub 로그인
Expand All @@ -57,8 +57,8 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME}}
password: ${{ secrets.DOCKER_TOKEN}}

# Docker Hub 에 푸시
- name: Build and push
# Docker Hub 에 Springboot 푸시
- name: Build and push springboot
uses: docker/build-push-action@v4
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/action-production-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
script: |
docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
sudo docker pull {{ secrets.DOCKER_REPOSITORY_PROD }}:latest
docker-compose -f docker-compose-dev.yml down
docker-compose -f docker-compose.yml down
docker rmi $(docker images -q)
cp -f ./src/main/resources/backend-submodule/docker-compose.yml .
rm -r src
Expand Down
42 changes: 42 additions & 0 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
events {
worker_connections 1024;
}

http {

# -------------------- spring-boot-prod WAS --------------------
upstream backend {
server server:8080;
}

# -------------------- spring-boot-dev WAS --------------------
server {
listen 80;
server_name dev.nainga.store;

# certbot 이 소유자임을 확인하는 경로
location /.well-known/acme-challenge {
root /var/lib/letsencrypt/; # 사용자 인증을 위한 파일이 생성 되는곳
}

# Redirect all traffic to HTTPS
location / {
return 301 https://$host$request_uri;
}
}

server {
listen 443 ssl;
server_name dev.nainga.store;

ssl_certificate /etc/letsencrypt/live/dev.nainga.store/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/dev.nainga.store/privkey.pem;

location / {
proxy_pass http://backend;
proxy_set_header Host $host; # 클라이언트가 요청한 호스트의 도메인
proxy_set_header X-Real-IP $remote_addr; # 클라이언트의 실제 IP 주소
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # 원격 클라이언트의 실제 IP 주소와, 이전에 거친 프록시 서버의 IP 주소들이 쉼표로 구분되어 포함
}
}
}
2 changes: 1 addition & 1 deletion src/test/resources/backend-submodule

0 comments on commit 1027241

Please sign in to comment.