Skip to content

Commit

Permalink
fix workflow for new location of compose
Browse files Browse the repository at this point in the history
  • Loading branch information
chbrandt committed Nov 14, 2023
1 parent f55bbca commit 80dbdf5
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,20 @@ jobs:

- name: Build image
run: |
cd dockerfiles/
docker compose build ${{ env.SERVICE }}
- name: Tag image
if: ${{ github.event_name == 'push' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
- name: Tag 'latest' image
if: ${{ github.ref_type == 'tag' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:latest
# DATE=`date +%Y%m%d`
Expand Down Expand Up @@ -119,17 +122,20 @@ jobs:

- name: Build image
run: |
cd dockerfiles/
docker compose build ${{ env.SERVICE }}
- name: Tag image
if: ${{ github.event_name == 'push' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
- name: Tag 'latest' image
if: ${{ github.ref_type == 'tag' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:latest
docker tag $NEW_IMAGE ${{ env.REPO }}:${ISIS_VERSION}
Expand Down Expand Up @@ -158,6 +164,7 @@ jobs:
- name: Save image
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker save --output /tmp/image.tar $NEW_IMAGE
Expand Down Expand Up @@ -200,17 +207,20 @@ jobs:

- name: Build image
run: |
cd dockerfiles/
docker compose build ${{ env.SERVICE }}
- name: Tag image
if: ${{ github.event_name == 'push' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
- name: Tag 'latest' image
if: ${{ github.ref_type == 'tag' }}
run: |
cd dockerfiles/
NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
docker tag $NEW_IMAGE ${{ env.REPO }}:latest
docker tag $NEW_IMAGE ${{ env.REPO }}:${ISIS_VERSION}-${ASP_VERSION}
Expand Down
1 change: 0 additions & 1 deletion dockerfiles/.env

This file was deleted.

22 changes: 22 additions & 0 deletions dockerfiles/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# BUILD attributes
# ----------------

ISIS_VERSION="7.1.0"
ASP_VERSION="3.2.0"
# ISIS_VERSION="8.0.0"
# ASP_VERSION="3.3.0"

GISPY_BASE_IMAGE="jupyter/scipy-notebook:2023-10-20"
GISPY_IMAGE="jupyter-gispy:latest"

ISIS_BASE_IMAGE="jupyter/minimal-notebook:2023-10-20"
ISIS_IMAGE="jupyter-isis:latest"

ASP_BASE_IMAGE="$ISIS_IMAGE"
ASP_IMAGE="jupyter-isis-asp:latest"


# ISIS-data directories environment variables in new image
# ------------------
ISISDATA="/mnt/isis/data"
ISISTESTDATA="/mnt/isis/testdata"
22 changes: 0 additions & 22 deletions dockerfiles/build.env

This file was deleted.

0 comments on commit 80dbdf5

Please sign in to comment.