Skip to content

Commit d847cdf

Browse files
committed
Initial reworking
1 parent e7f3c73 commit d847cdf

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

.github/workflows/deploy.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
name: Deploy
44

55
on:
6+
workflow_dispatch:
67
push:
78
branches: develop
89

@@ -38,18 +39,19 @@ jobs:
3839
uses: docker/build-push-action@v6
3940
with:
4041
push: true
41-
tags: us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events
42+
tags: us-central1-docker.pkg.dev/api-tools-451421/runners/daily
43+
build-args: RUN_SCRIPT_PATH=runners/daily.sh
4244

4345
- name: Upload to dev job
4446
uses: google-github-actions/deploy-cloudrun@v2
4547
with:
46-
job: 'daily-update-events-dev'
47-
image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events'
48+
job: 'daily-dev'
49+
image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily'
4850
region: us-central1
4951

5052
- name: Upload to prod job
5153
uses: google-github-actions/deploy-cloudrun@v2
5254
with:
53-
job: 'daily-update-events-prod'
54-
image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily-update-events'
55+
job: 'daily-prod'
56+
image: 'us-central1-docker.pkg.dev/api-tools-451421/runners/daily'
5557
region: us-central1

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM golang:1.23 AS builder
22

3+
ARG RUN_SCRIPT_PATH
4+
35
WORKDIR /app
46
COPY . .
57

@@ -25,7 +27,7 @@ ENV GOOGLE_CHROME_BIN /usr/bin/chromium # Also set this for compatibility
2527

2628
# Copy build file from builder
2729
COPY --from=builder /app/api-tools /app/api-tools
28-
COPY deploy.sh /app/deploy.sh
30+
COPY $RUN_SCRIPT_PATH /app/$RUN_SCRIPT_PATH
2931

30-
RUN chmod +x /app/deploy.sh
31-
ENTRYPOINT ["/app/deploy.sh"]
32+
RUN chmod +x /app/$RUN_SCRIPT_PATH
33+
ENTRYPOINT ["/app/$RUN_SCRIPT_PATH"]

deploy.sh renamed to runners/daily.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ rm service_account.json
88
# .env
99
gcloud secrets versions access latest --secret="$ENV_SECRET_NAME" > .env
1010

11-
# Scrape, parse, and upload
11+
# other daily activites
12+
# ...
13+
14+
# Scrape, parse, and upload events
1215
./api-tools -scrape -mazevo -verbose
1316
./api-tools -parse -mazevo -verbose
1417
./api-tools -scrape -astra -verbose

0 commit comments

Comments
 (0)