Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/deploy-user-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: ./gradlew clean :nowait-app-user-api:bootJar -x test

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
Expand All @@ -67,28 +67,28 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Copy docker-compose.user.yml to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "docker-compose.user.yml"
target: ${{ env.EC2_DEPLOY_PATH }}
- name: Set Prometheus YML
run: |
echo "${{ secrets.PROMETHEUS_DEV_YML }}" \
| base64 --decode \
> prometheus.yml

- name: Copy deploy-user-docker to EC2
- name: Copy compose, prometheus.yml & deploy script to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "scripts/deploy-user-docker.sh"
target: "${{ env.EC2_DEPLOY_PATH }}"
source:
- "docker-compose.user.yml"
- "docker-compose.user-monitoring.yml"
- "prometheus.yml"
- "scripts/deploy-user-docker.sh"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
Expand Down
7 changes: 7 additions & 0 deletions nowait-app-user-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ dependencies {
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

// actuator
implementation 'org.springframework.boot:spring-boot-starter-actuator'

// prometheus
implementation 'io.micrometer:micrometer-registry-prometheus'

// test
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
"/swagger-resources/**",
"/webjars/**",
"/demo-ui.html",
"/v1/menus//all-menus/stores/**"
"/v1/menus/all-menus/stores/**",
"/nowait/management/**"
)
.permitAll()
.anyRequest().authenticated() // 그외 요청은 허가된 사람만 인가
Expand Down
4 changes: 2 additions & 2 deletions scripts/deploy-user-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ else
fi

echo "3. start container"
sudo docker-compose -f docker-compose.user.yml -p nowait_dev pull nowait-app-user-api
sudo docker-compose -f docker-compose.user.yml -p nowait_dev up -d nowait-app-user-api
sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev pull nowait-app-user-api prometheus grafana
sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev up -d nowait-app-user-api prometheus grafana

echo "4. check container status"
NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api")
Expand Down