Skip to content

Commit

Permalink
Merge pull request #6073 from felder/felder_nature_own_image
Browse files Browse the repository at this point in the history
moving nature to own repo
  • Loading branch information
felder authored Sep 4, 2024
2 parents 46ffe88 + 3844877 commit b5c24e1
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 134 deletions.
25 changes: 0 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,6 @@ jobs:
# hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH}
# no_output_timeout: 30m

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

- run:
name: Deploy prob140
command: |
Expand Down Expand Up @@ -472,15 +466,6 @@ workflows:
# ignore:
# - staging
# - prod
- hubploy/build-image:
deployment: nature
name: nature image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: publichealth
name: publichealth image build
Expand Down Expand Up @@ -645,15 +630,6 @@ workflows:
# branches:
# only:
# - staging
- hubploy/build-image:
deployment: nature
name: nature image build
push: true
# Filters can only be per-job? wtf
filters:
branches:
only:
- staging
- hubploy/build-image:
deployment: publichealth
name: publichealth image build
Expand Down Expand Up @@ -701,7 +677,6 @@ workflows:
- ischool image build
- julia hub image build
# - logodev image build
- nature image build
- publichealth image build
- shiny image build

Expand Down
10 changes: 1 addition & 9 deletions deployments/nature/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/nature-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/nature-user-image:anything

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

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

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

This file was deleted.

37 changes: 0 additions & 37 deletions deployments/nature/image/environment.yml

This file was deleted.

6 changes: 0 additions & 6 deletions deployments/nature/image/postBuild

This file was deleted.

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

This file was deleted.

0 comments on commit b5c24e1

Please sign in to comment.