Skip to content

Commit a5df6e9

Browse files
committed
dockerfile?
1 parent dbd422c commit a5df6e9

2 files changed

Lines changed: 18 additions & 42 deletions

File tree

.github/workflows/google-cloudrun-docker.yml

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,9 @@ jobs:
4545
4646
deploy-to-cloud-run:
4747
name: Deploy to Cloud Run
48-
needs: [build-and-push]
48+
needs: build-and-push
4949
runs-on: ubuntu-latest
5050
environment: GCP-Rozen
51-
env:
52-
PROJECT_ID: ${{ vars.GCP_PROJECT_ID }}
53-
PROJECT_REGION: ${{ vars.GCP_PROJECT_REGION }}
54-
SERVICE_ACCOUNT: ${{ vars.GCP_SA_EMAIL }}
55-
API_SERVICE: ${{ vars.GCP_SERVICE_API_NAME }}
56-
API_MAX_INSTANCES: ${{ vars.GCP_SERVICE_API_MAX_INSTANCES }}
57-
API_IMAGE: ${{ vars.GCP_PROJECT_REGION }}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/${{ vars.GCP_ARTIFACT_REGISTRY }}/${{ vars.GCP_SERVICE_API_NAME }}:${{ github.sha }}
58-
#UI_SERVICE: ${{ vars.GCP_SERVICE_UI_NAME }}
59-
#UI_MAX_INSTANCES: ${{ vars.GCP_SERVICE_UI_MAX_INSTANCES }}
60-
#UI_IMAGE: ${{ vars.GCP_PROJECT_REGION }}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/${{ vars.GCP_ARTIFACT_REGISTRY }}/${{ vars.GCP_SERVICE_UI_NAME }}:${{ github.sha }}
61-
#SQL_INSTANCE_NAME: ${{ vars.GCP_SQL_INSTANCE_CONNECTION_NAME }}
62-
TG_TOKEN_SECRET: ${{ vars.GCP_SECRET_TG_BOT_TOKEN }}
63-
DB_URL_SECRET: ${{ vars.GCP_SECRET_DB_URL }}
64-
DB_USER_SECRET: ${{ vars.GCP_SECRET_DB_USER }}
65-
DB_PASSWORD_SECRET: ${{ vars.GCP_SECRET_DB_PASSWORD }}
66-
DB_PORT: ${{ vars.GCP_DB_PORT }}
67-
#TG_PAYMENTS_SECRET: ${{ vars.GCP_SECRET_TG_PAYMENTS_TOKEN }}
68-
#JWT_SECRET: ${{ vars.GCP_SECRET_JWT_SECRET }}
69-
#DB_URL_SECRET: ${{ vars.GCP_SECRET_DB_URL }}
70-
#S3_URL_SECRET: ${{ vars.GCP_SECRET_S3_URL }}
71-
S3_ACCESS_ID: ${{ vars.GCP_SECRET_S3_ACCESS_ID }}
72-
S3_ACCESS_SECRET: ${{ vars.GCP_SECRET_S3_ACCESS_SECRET }}
73-
S3_HOST: ${{ vars.GCP_SECRET_S3_HOST }}
74-
S3_BUCKET: ${{ vars.GCP_S3_BUCKET }}
7551
if: github.event_name == 'push' || github.event_name == 'pull_request'
7652
permissions:
7753
contents: 'read'
@@ -92,20 +68,20 @@ jobs:
9268
run: echo "TAG=${{ env.PROJECT_REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.ARTIFACT_REGISTRY }}/${{ env.SERVICE_NAME }}:${{ github.sha }}" >> $GITHUB_ENV
9369

9470
- name: Deploy to Cloud Run
95-
9671
run: |-
97-
gcloud --quiet run deploy ${{ env.API_SERVICE }} \
98-
--image=${{ env.API_IMAGE }} \
99-
--region=${{ env.PROJECT_REGION }} \
100-
--service-account=${{ env.SERVICE_ACCOUNT }} \
101-
--max-instances=${{ env.API_MAX_INSTANCES }} \
102-
--set-secrets=TELEGRAM_BOT_TOKEN=${{ env.TG_TOKEN_SECRET }}:latest \
103-
--set-secrets=DB_URL=${{ env.DB_URL_SECRET }}:latest \
104-
--set-secrets=DB_USER=${{ env.DB_USER_SECRET }}:latest \
105-
--set-secrets=DB_PASSWORD=${{ env.DB_PASSWORD_SECRET }}:latest \
106-
--set-env-vars=DB_PORT=${{ env.DB_PORT }} \
107-
--set-secrets=S3_ACCESS_ID=${{ env.S3_ACCESS_ID }}:latest \
108-
--set-secrets=S3_ACCESS_SECRET=${{ env.S3_ACCESS_SECRET }}:latest \
109-
--set-secrets=S3_HOST=${{ env.S3_HOST }}:latest \
110-
--set-env-vars=S3_BUCKET=${{ env.S3_BUCKET }} \
111-
--allow-unauthenticated
72+
gcloud run deploy ${{ env.SERVICE_NAME }} \
73+
--image $TAG \
74+
--region ${{ env.PROJECT_REGION }} \
75+
--service-account ${{ vars.GCP_SA_EMAIL }} \
76+
--max-instances=${{ vars.GCP_SERVICE_API_MAX_INSTANCES }} \
77+
--set-secrets=TELEGRAM_BOT_TOKEN=${{ vars.GCP_DCUBABOT_SECRET_TG_BOT_TOKEN }}:latest \
78+
--set-secrets=DB_URL=${{ vars.GCP_SECRET_DB_URL }}:latest \
79+
--set-secrets=DB_USER=${{ vars.GCP_SECRET_DB_USER }}:latest \
80+
--set-secrets=DB_PASSWORD=${{ vars.GCP_SECRET_DB_PASSWORD }}:latest \
81+
--set-env-vars=DB_PORT=${{ vars.GCP_DB_PORT }} \
82+
--set-secrets=S3_ACCESS_ID=${{ vars.GCP_SECRET_S3_ACCESS_ID }}:latest \
83+
--set-secrets=S3_ACCESS_SECRET=${{ vars.GCP_SECRET_S3_ACCESS_SECRET }}:latest \
84+
--set-secrets=S3_HOST=${{ vars.GCP_SECRET_S3_HOST }}:latest \
85+
--set-env-vars=S3_BUCKET=${{ vars.GCP_S3_BUCKET }} \
86+
--platform managed \
87+
--allow-unauthenticated

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ COPY . .
3030
ENV PYTHONPATH /app/packages
3131

3232

33-
CMD ["python", "main.py"]
33+
CMD ["main.py"]

0 commit comments

Comments
 (0)