Skip to content

Commit 54e66df

Browse files
chore(CI):update config
1 parent eaa777e commit 54e66df

File tree

8 files changed

+41
-58
lines changed

8 files changed

+41
-58
lines changed

.github/workflows/back.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,48 @@ jobs:
2828
username: _json_key
2929
password: ${{ secrets.DOCKER_REGISTRY_SA }}
3030

31-
push:
31+
push-gateway:
3232
needs: login
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Build and push
3636
uses: docker/build-push-action@v6
3737
with:
38-
context: "{{defaultContext}}:backend"
38+
context: "{{defaultContext}}:backend/gateway"
3939
push: true
40-
tags: ${{ secrets.SERVICE_NAME }}:latest
40+
tags: ${{ secrets.GATEWAY_SERVICE_NAME }}:latest
4141

42-
deploy:
43-
needs: push
42+
push-storage:
43+
needs: login
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Build and push
47+
uses: docker/build-push-action@v6
48+
with:
49+
context: "{{defaultContext}}:backend/storage"
50+
push: true
51+
tags: ${{ secrets.STORAGE_SERVICE_NAME }}:latest
52+
53+
deploy-gateway:
54+
needs: push-gateway
55+
runs-on: ubuntu-latest
56+
57+
steps:
58+
- uses: actions/checkout@v4
59+
- name: Deploy artifact
60+
run: |
61+
gcloud auth activate-service-account ${{ secrets.CLOUD_RUN_SA }} --key-file=${{ secrets.CLOUD_RUN_SA_KEY }}
62+
gcloud run deploy ${{ secrets.GATEWAY_SERVICE_NAME }} --service-account=${{ secrets.CLOUD_RUN_SA }} --allow-unauthenticated --region=${{ secrets.REGION }} --project=${{ secrets.REGION }} --port=80 --image=${{ secrets.REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/${{ secrets.GATEWAY_SERVICE_NAME }}/${{ secrets.GATEWAY_SERVICE_NAME }}:latest
63+
gcloud beta run services add-iam-policy-binding --region=${{ secrets.REGION }} --member=allUsers --role=roles/run.invoker ${{ secrets.GATEWAY_SERVICE_NAME }} --project=${{ secrets.PROJECT_ID}}
64+
65+
deploy-storage:
66+
needs: push-storage
4467
runs-on: ubuntu-latest
4568

4669
steps:
4770
- uses: actions/checkout@v4
4871
- name: Deploy artifact
4972
run: |
5073
gcloud auth activate-service-account ${{ secrets.CLOUD_RUN_SA }} --key-file=${{ secrets.CLOUD_RUN_SA_KEY }}
51-
gcloud run deploy ${{ secrets.SERVICE_NAME }} --service-account=${{ secrets.CLOUD_RUN_SA }} --allow-unauthenticated --region=${{ secrets.REGION }} --project=${{ secrets.REGION }} --port=80 --image=${{ secrets.REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/${{ secrets.SERVICE_NAME }}/${{ secrets.SERVICE_NAME }}:latest
52-
gcloud beta run services add-iam-policy-binding --region=${{ secrets.REGION }} --member=allUsers --role=roles/run.invoker ${{ secrets.SERVICE_NAME }} --project=${{ secrets.PROJECT_ID}}
74+
gcloud run deploy ${{ secrets.STORAGE_SERVICE_NAME }} --service-account=${{ secrets.CLOUD_RUN_SA }} --allow-unauthenticated --region=${{ secrets.REGION }} --project=${{ secrets.REGION }} --port=80 --image=${{ secrets.REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/${{ secrets.STORAGE_SERVICE_NAME }}/${{ secrets.STORAGE_SERVICE_NAME }}:latest
75+
gcloud beta run services add-iam-policy-binding --region=${{ secrets.REGION }} --member=allUsers --role=roles/run.invoker ${{ secrets.STORAGE_SERVICE_NAME }} --project=${{ secrets.PROJECT_ID}}

.github/workflows/front.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
with:
5858
name: build
5959
path: ./build
60+
- name: debug
61+
run: ls -l
6062
- name: Build and push
6163
uses: docker/build-push-action@v6
6264
with:

Dockerfile-back

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

Dockerfile-front

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

backend/gateway/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM ubuntu:latest
2+
LABEL authors="thiba"
3+
4+
ENTRYPOINT ["top", "-b"]

backend/storage/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM ubuntu:latest
2+
LABEL authors="thiba"
3+
4+
ENTRYPOINT ["top", "-b"]

docker-compose.yml

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

frontend-web/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ RUN echo 'server { \
1515
}' >> /etc/nginx/conf.d/default.conf
1616
RUN rm -rf /usr/share/nginx/html/*
1717

18-
COPY frontend-web/build /usr/share/nginx/html
18+
COPY ./build /usr/share/nginx/html

0 commit comments

Comments
 (0)