Skip to content

Commit d652898

Browse files
authored
Merge pull request #362 from sparcs-kaist/feature/web-push
Feature/web push
2 parents bee9e6c + e037eeb commit d652898

File tree

13 files changed

+2580
-239
lines changed

13 files changed

+2580
-239
lines changed

.env

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/aws.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ name: Deploy to Amazon ECR newara-front
3737
env:
3838
AWS_REGION: ap-northeast-2
3939
ECR_REPOSITORY: newara-front
40+
FIREBASE_CONFIG_PROD: ${{ secrets.FIREBASE_CONFIG_PROD }}
41+
FIREBASE_CONFIG_DEV: ${{ secrets.FIREBASE_CONFIG_DEV }}
42+
FIREBASE_VAPID_KEY_PROD: ${{ secrets.FIREBASE_VAPID_KEY_PROD }}
43+
FIREBASE_VAPID_KEY_DEV: ${{ secrets.FIREBASE_VAPID_KEY_DEV }}
4044

4145
defaults: # do we need this?
4246
run:
@@ -77,6 +81,6 @@ jobs:
7781
# be deployed to ECS.
7882
chmod +x ./.github/workflows/github-actions.sh
7983
. ./.github/workflows/github-actions.sh
80-
docker build --cache-from $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG --build-arg VUE_APP_API_MODE -t $ECR_REGISTRY/$ECR_REPOSITORY:$DOCKER_TAG .
84+
docker build --cache-from $ECR/$PROJECT_NAME:$CACHE_DOCKER_TAG --build-arg VUE_APP_API_MODE --build-arg VUE_APP_FIREBASE_CONFIG --build-arg VUE_APP_FIREBASE_VAPID_KEY -t $ECR_REGISTRY/$ECR_REPOSITORY:$DOCKER_TAG .
8185
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$DOCKER_TAG
8286
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$DOCKER_TAG"

.github/workflows/github-actions.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ if [ ! -z $GITHUB_REF ]; then
1111
export DOCKER_TAG=prod
1212
export CACHE_DOCKER_TAG=prod
1313
export VUE_APP_API_MODE=production
14+
export VUE_APP_FIREBASE_CONFIG=$FIREBASE_CONFIG_PROD
15+
export VUE_APP_FIREBASE_VAPID_KEY=$FIREBASE_VAPID_KEY_PROD
1416
else
1517
# Docker tag에 /가 들어갈 수 없어서 -로 변경
1618
export DOCKER_TAG=$(echo $NAME | sed -e "s/\//-/g")
1719
export CACHE_DOCKER_TAG=dev
1820
export VUE_APP_API_MODE=development
21+
export VUE_APP_FIREBASE_CONFIG=$FIREBASE_CONFIG_DEV
22+
export VUE_APP_FIREBASE_VAPID_KEY=$FIREBASE_VAPID_KEY_DEV
1923
fi
2024
elif [ $TRIGGER_TYPE = "tags" ]; then
2125
export DOCKER_TAG=$NAME
2226
export CACHE_DOCKER_TAG=prod
2327
export VUE_APP_API_MODE=production
28+
export VUE_APP_FIREBASE_CONFIG=$FIREBASE_CONFIG_PROD
29+
export VUE_APP_FIREBASE_VAPID_KEY=$FIREBASE_VAPID_KEY_PROD
2430
fi
2531
fi
2632

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ node_modules
33
/dist
44

55
# local env files
6+
.env
67
.env.local
78
.env.*.local
9+
swenv.js
810

911
# Log files
1012
npm-debug.log*

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ RUN apk del --purge .build-deps
2222
COPY . .
2323

2424
ARG VUE_APP_API_MODE
25-
RUN echo "VUE_APP_API_MODE=$VUE_APP_API_MODE" > .env
25+
ARG VUE_APP_FIREBASE_CONFIG
26+
ARG VUE_APP_FIREBASE_VAPID_KEY
27+
RUN echo "VUE_APP_API_MODE=$VUE_APP_API_MODE" >> .env
28+
RUN echo "VUE_APP_FIREBASE_CONFIG=$VUE_APP_FIREBASE_CONFIG" >> .env
29+
RUN echo "VUE_APP_FIREBASE_VAPID_KEY=$VUE_APP_FIREBASE_VAPID_KEY" >> .env
2630
RUN npm run build
2731

2832
FROM nginx:1.19-alpine as newara-web

0 commit comments

Comments
 (0)