Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-gen3-dep-version-checker
Browse files Browse the repository at this point in the history
  • Loading branch information
george42-ctds authored Apr 3, 2024
2 parents 29e4224 + 797fdf3 commit e955f3d
Show file tree
Hide file tree
Showing 17 changed files with 325 additions and 134 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/build_awshelper.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build awshelper image

# Always build this image because it contains all the cloud-automation files.
# Some jobs depend on arbitrary files and we need to test them with updated awshelper images.
on: push

jobs:
awshelper:
name: awshelper
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/awshelper/Dockerfile"
OVERRIDE_REPO_NAME: "awshelper"
secrets:
ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}

23 changes: 23 additions & 0 deletions .github/workflows/build_python3.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build Python 3.10 image

on:
push:
paths:
- .github/workflows/build_python3.10.yaml
- Docker/python-nginx/python3.10-buster/**

jobs:
python_3-10:
name: Python 3.10
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/python-nginx/python3.10-buster/Dockerfile"
DOCKERFILE_BUILD_CONTEXT: "./Docker/python-nginx/python3.10-buster"
OVERRIDE_REPO_NAME: "python"
OVERRIDE_TAG_NAME: "python3.10-buster-$(echo ${GITHUB_REF#refs/*/} | tr / _)"
secrets:
ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}

23 changes: 23 additions & 0 deletions .github/workflows/build_python3.9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build Python 3.9 image

on:
push:
paths:
- .github/workflows/build_python3.9.yaml
- Docker/python-nginx/python3.9-buster/**

jobs:
python_3-9:
name: Python 3.9
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/python-nginx/python3.9-buster/Dockerfile"
DOCKERFILE_BUILD_CONTEXT: "./Docker/python-nginx/python3.9-buster"
OVERRIDE_REPO_NAME: "python"
OVERRIDE_TAG_NAME: "python3.9-buster-$(echo ${GITHUB_REF#refs/*/} | tr / _)"
secrets:
ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}

42 changes: 0 additions & 42 deletions .github/workflows/image_build_push.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions files/dashboard/maintenance-page/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class='nav-bar'>
<div class='nav-bar__header'>
<div class='nav-bar__logo'>
<img src='img/header-logo.png' class='nav-bar__logo-img' />
<img src='img/header-logo.png' class='nav-bar__logo-img' alt='Gen3 Data Commons'/>
</div>
</div>
</div>
Expand All @@ -27,12 +27,12 @@ <h1>This site is under maintenance...</h1>
Please check back later.
</p>
</div>
<img src='img/error.svg' class='error-img' />
<img src='img/error.svg' class='error-img' alt='A shiba dog looking into the distance'/>
</div>
<div class='footer'>
<div class="footer__logo-area">
<img class='footer__img' src='img/gen3.png' />
<img class='footer__img' src='img/createdby.png' />
<img class='footer__img' src='img/gen3.png' alt='Gen3 Data Commons'/>
<img class='footer__img' src='img/createdby.png' alt='Center for Translational Data Science at the University of Chicago'/>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit e955f3d

Please sign in to comment.