Skip to content

Commit 14862a1

Browse files
committed
fix:envirenment val refactor
1 parent 597ded7 commit 14862a1

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

.github/workflows/CI.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ jobs:
2323
java-version: '17'
2424
distribution: 'temurin'
2525

26-
- name: Set Environment Variables
26+
- name: Create .env file
2727
run: |
28-
export DB_ADDRESS=${{ secrets.DB_ADDRESS }}
29-
export DB_USER=${{ secrets.DB_USER }}
30-
export DB_PASSWORD=${{ secrets.DB_PASSWORD }}
31-
export REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
32-
export GMAIL_ADDRESS=${{ secrets.GMAIL_ADDRESS }}
33-
export GMAIL_PASSWORD=${{ secrets.GMAIL_PASSWORD }}
34-
export JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}
28+
echo "DB_ADDRESS=${{ secrets.DB_ADDRESS }}" >> .env
29+
echo "DB_USER=${{ secrets.DB_USER }}" >> .env
30+
echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
31+
echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env
32+
echo "GMAIL_PASSWORD=${{ secrets.GMAIL_PASSWORD }}" >> .env
33+
echo "GMAIL_ADDRESS=\"${{ secrets.GMAIL_ADDRESS }}\"" >> .env
34+
echo "JWT_SECRET_KEY=\"${{ secrets.JWT_SECRET_KEY }}\"" >> .env
35+
36+
- name: Start Docker Compose with .env
37+
run: docker compose --env-file .env up -d
3538

3639
- name: Start Docker Compose
3740
run: docker compose up -d
@@ -56,6 +59,14 @@ jobs:
5659
5760
5861
- name: Build and Test with Gradle
62+
env:
63+
SPRING_DATASOURCE_URL: jdbc:mysql://${{ secrets.DB_ADDRESS }}
64+
SPRING_DATASOURCE_USERNAME: ${{ secrets.DB_USER }}
65+
SPRING_DATASOURCE_PASSWORD: ${{ secrets.DB_PASSWORD }}
66+
SPRING_DATA_REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
67+
SPRING_JWT_SECRET: ${{ secrets.JWT_SECRET_KEY }}
68+
SPRING_MAIL_USERNAME: ${{ secrets.GMAIL_ADDRESS }}
69+
SPRING_MAIL_PASSWORD: ${{ secrets.GMAIL_PASSWORD }}
5970
run: ./gradlew build --stacktrace
6071

6172
- name: Test build success

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ services:
33
image: renzzle/github-action:latest
44
ports:
55
- "9001:9001"
6-
# env_file:
7-
# - .env
6+
env_file:
7+
- .env
88
environment:
99
- REDIS_PASSWORD=${REDIS_PASSWORD}
1010
networks:

0 commit comments

Comments
 (0)