fixing tag names must use repo for publishing

jac18281828 · Mar 18, 2023 · 72b8911 · 72b8911
1 parent f54a22f
commit 72b8911
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -69,12 +69,12 @@ jobs:
             ETOPO_SURFACE=${{ matrix.surface }}
             VERSION=${{ github.event.release.tag_name }}            
           tags: |
-            ${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}-v${{ github.event.release.tag_name }}
-            ${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}-${{ env.REPOSITORY_SHA }}
-            ${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}
-            ${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:latest            
-            ghcr.io/${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}-v${{ github.event.release.tag_name }}
-            ghcr.io/${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}-${{ env.REPOSITORY_SHA }}
-            ghcr.io/${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:${{ matrix.res }}
-            ghcr.io/${{ env.REPOSITORY_PATH }}/${{ matrix.surface }}:latest
+            ${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}-v${{ github.event.release.tag_name }}
+            ${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}-${{ env.REPOSITORY_SHA }}
+            ${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}
+            ${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}
+            ghcr.io/${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}-v${{ github.event.release.tag_name }}
+            ghcr.io/${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}-${{ env.REPOSITORY_SHA }}
+            ghcr.io/${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}-${{ matrix.res }}
+            ghcr.io/${{ env.REPOSITORY_PATH }}:${{ matrix.surface }}
 
diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile
@@ -27,7 +27,6 @@ ARG ETOPO_VERSION
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt update && \
     apt install -y -q --no-install-recommends \
-    coreutils \ 
     gmt gmt-gshhg-high ghostscript python3 && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
@@ -42,8 +41,7 @@ COPY --from=builder /bedrock/ /bedrock/
 
 WORKDIR /bedrock
 COPY . .
-RUN sha256sum /bedrock/ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc > /bedrock/ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc.sha256
-RUN VERIFICATION=$(cat /bedrock/ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc.sha256) && echo "ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc sha256 is ${VERIFICATION}"
+RUN sha256sum /bedrock/ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc | tee /bedrock/ETOPO_2022_${ETOPO_VERSION}_${ETOPO_RES}_N90W180_${ETOPO_SURFACE}.nc.sha256
 
 LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.name="bedrock" \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   etopo-2022-bedrock-30s:
-    image:  jac18281828/bedrock/bed:etopo-2022-30s-gmt6-bedrock-${VERSION}
+    image:  jac18281828/bedrock-bed:etopo-2022-30s-gmt6-bedrock-${VERSION}
     network_mode: none    
     build:
       context: bedrock/      
@@ -10,7 +10,7 @@ services:
         - ETOPO_SURFACE=bed
         - ETOPO_VERSION=v1
   etopo-2022-ice-surface-30s:
-    image:  jac18281828/bedrock/surface:etopo-2022-30s-gmt6-surface-${VERSION}
+    image:  jac18281828/bedrock-surface:etopo-2022-30s-gmt6-surface-${VERSION}
     network_mode: none    
     build:
       context: bedrock/