Skip to content

Commit

Permalink
Merge pull request #6307 from berkeley-dsep-infra/staging
Browse files Browse the repository at this point in the history
merging 6298/6299/6300/6301/6302/6303/6304/6305/6306 to prod
  • Loading branch information
shaneknapp authored Sep 30, 2024
2 parents ae833ed + 7fd1167 commit e1ddcaf
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion deployments/a11y/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:65e4cb99b4aa
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:fe7dcc02d586

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data100/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:d3a95b9af686
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:511c4637d702

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data101/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:010ca9abfb71
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:48a90d76171a

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data102/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:ba17dfb0e793
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:1ae8a9184467

registry:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data8/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image:949086545647
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image:84d9c800dba0

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/edx/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:64d38046ca94
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:44cfbcb5cc13

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/logodev/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
images:
# temporary update
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:ae0f4c4e7753
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:166722c68e0d

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/publichealth/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:8b70e125f905
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:017e1f8f1a30

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion scripts/user-image-management/manage-image-repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ def push(args):
if not os.path.exists(path):
print(f"Skipping {name} as it doesn't exist.")
continue
print(f"Pushing {name} to {args.origin}...")
if not args.origin:
remote = "origin"
else:
remote = args.origin
print(f"Pushing {name} to {remote}...")
subprocess.check_call(["git", "push", remote, args.branch], cwd=path)
print()

Expand Down

0 comments on commit e1ddcaf

Please sign in to comment.