Skip to content

Commit

Permalink
Merge pull request #6086 from shaneknapp/move-ugr01-new-image-repo
Browse files Browse the repository at this point in the history
[DH-301] moving ugr01 to its own image repo
  • Loading branch information
shaneknapp authored Sep 5, 2024
2 parents a92c94b + d14bcc4 commit e62fe5b
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 231 deletions.
23 changes: 0 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,6 @@ jobs:
hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH}
no_output_timeout: 30m

- run:
name: Deploy ugr01
command: |
hubploy deploy --timeout 30m ugr01 hub ${CIRCLE_BRANCH}
no_output_timeout: 30m

- run:
name: Deploy workshop
command: |
Expand Down Expand Up @@ -469,15 +463,6 @@ workflows:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: ugr01
name: ugr01 image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod

deploy:
jobs:
Expand Down Expand Up @@ -624,14 +609,6 @@ workflows:
branches:
only:
- staging
- hubploy/build-image:
deployment: ugr01
name: ugr01 image build
push: true
filters:
branches:
only:
- staging
# Build images only during the staging deploy. All merges
# to prod need to go via staging, so prod should *never*
# use images not built for staging. By enforcing this at the
Expand Down
10 changes: 1 addition & 9 deletions deployments/ugr01/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ugr01-user-image
path: image/
repo2docker:
base_image: docker.io/library/buildpack-deps:jammy
registry:
provider: gcloud
gcloud:
project: ucb-datahub-2018
service_key: gcr-key.json
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ugr01-user-image:PLACEHOLDER

cluster:
provider: gcloud
Expand Down
5 changes: 5 additions & 0 deletions deployments/ugr01/image/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ugr01 Image

This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/ugr01-user-image).

Please see [the contribution guide](https://github.com/berkeley-dsep-infra/ugr01-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
97 changes: 0 additions & 97 deletions deployments/ugr01/image/apt.txt

This file was deleted.

63 changes: 0 additions & 63 deletions deployments/ugr01/image/environment.yml

This file was deleted.

29 changes: 0 additions & 29 deletions deployments/ugr01/image/infra-requirements.txt

This file was deleted.

5 changes: 0 additions & 5 deletions deployments/ugr01/image/postBuild

This file was deleted.

5 changes: 0 additions & 5 deletions deployments/ugr01/image/start

This file was deleted.

0 comments on commit e62fe5b

Please sign in to comment.