File tree Expand file tree Collapse file tree 2 files changed +11
-24
lines changed
src/main/java/nambang_swag/bada_on/config Expand file tree Collapse file tree 2 files changed +11
-24
lines changed Original file line number Diff line number Diff line change @@ -61,19 +61,21 @@ jobs:
6161 aws-region : ap-northeast-2
6262
6363 - name : 개발 서버 배포
64- env :
65- FIREBASE_KEY : ${{ secrets.FIREBASE_KEY }}
6664 uses : appleboy/ssh-action@master
6765 with :
6866 host : ${{ secrets.DEV_AWS_EC2_PUBLIC_IP }}
6967 username : ec2-user
7068 key : ${{ secrets.AWS_EC2_PEM_KEY }}
7169 script : |
72- cd /home/ec2-user/potatoes/dev
70+ cd /home/ec2-user/bada-on/dev
71+ echo '${{ secrets.FIREBASE_KEY }}' > firebase-service-account.json
7372 docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
7473 docker stop develop-server
7574 docker rm develop-server
7675 docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}
7776 docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}:latest
78- docker run --name develop-server -d -p 80:8080 -e SPRING_PROFILES_ACTIVE=dev -v "$(pwd)/firebase-key.json:/app/config/firebase-key.json" ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}:latest
77+ docker run --name develop-server -d -p 80:8080 \
78+ -e SPRING_PROFILES_ACTIVE=dev \
79+ -v $(pwd)/firebase-service-account.json:/app/firebase-service-account.json \
80+ ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}:latest
7981 docker image prune -f
Original file line number Diff line number Diff line change @@ -19,25 +19,10 @@ public class FireBaseConfig {
1919
2020 @ Bean
2121 public FirebaseApp initializeFirebase () throws IOException {
22- String firebaseKey = System .getenv ("FIREBASE_KEY" );
23- File keyFile = new File ("/app/config/firebase-key.json" );
24-
25- if (firebaseKey != null && !firebaseKey .isEmpty ()) {
26- // 환경 변수에서 키를 읽는 경우
27- InputStream serviceAccount = new ByteArrayInputStream (firebaseKey .getBytes (StandardCharsets .UTF_8 ));
28- FirebaseOptions options = FirebaseOptions .builder ()
29- .setCredentials (GoogleCredentials .fromStream (serviceAccount ))
30- .build ();
31- return FirebaseApp .initializeApp (options );
32- } else if (keyFile .exists ()) {
33- // 파일에서 키를 읽는 경우
34- FileInputStream serviceAccount = new FileInputStream (keyFile );
35- FirebaseOptions options = FirebaseOptions .builder ()
36- .setCredentials (GoogleCredentials .fromStream (serviceAccount ))
37- .build ();
38- return FirebaseApp .initializeApp (options );
39- } else {
40- throw new IllegalStateException ("Firebase 인증 정보를 찾을 수 없습니다." );
41- }
22+ FileInputStream serviceAccount = new FileInputStream ("/app/firebase-service-account.json" );
23+ FirebaseOptions options = FirebaseOptions .builder ()
24+ .setCredentials (GoogleCredentials .fromStream (serviceAccount ))
25+ .build ();
26+ return FirebaseApp .initializeApp (options );
4227 }
4328}
You can’t perform that action at this time.
0 commit comments