From 5a6d8a7de7017fe88cfcf3eadd125c08e47e62cc Mon Sep 17 00:00:00 2001
From: Julian Andrej <andrej1@llnl.gov>
Date: Tue, 21 Nov 2023 08:11:36 -0800
Subject: [PATCH] correct naming

---
 .github/workflows/build-and-push-images.yml | 16 +++++++++++-----
 docker-compose.yaml                         |  6 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml
index ea30222..f7c8731 100644
--- a/.github/workflows/build-and-push-images.yml
+++ b/.github/workflows/build-and-push-images.yml
@@ -9,7 +9,7 @@ on:
 env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
-  IMAGE_NAME_BASE: ${{ github.repository }}
+  IMAGE_NAME_PREFIX: ${{ github.repository }}
 
 jobs:
 
@@ -30,13 +30,19 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: build base image
-      run: docker-compose build base ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BASE }}/base:latest .
+      run: docker-compose build base
+
+    - name: tag base image
+      run: docker tag mfem-base ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_PREFIX }}/base:latest
 
     - name: push base image
-      run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BASE }}/base:latest
+      run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_PREFIX }}/base:latest
 
     - name: build cpu image
-      run: docker-compose build cpu ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BASE }}/cpu:latest .
+      run: docker-compose build cpu ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_PREFIX }}/cpu:latest .
+
+    - name: tag cpu image
+      run: docker tag mfem-cpu ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_PREFIX }}/cpu:latest
 
     - name: push cpu image
-      run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BASE }}/cpu:latest
+      run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_PREFIX }}/cpu:latest
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7b3333e..1437f18 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
       context: base
       args:
         num_jobs: 2
-    image: mfem/containers/base
+    image: mfem-base
 
   cpu:
     build:
@@ -14,7 +14,7 @@ services:
       args:
         num_jobs: 2
         hypre_version: 2.27.0
-    image: mfem/containers/cpu
+    image: mfem-cpu
 
   cuda:
     build:
@@ -23,4 +23,4 @@ services:
         num_jobs: 2
         cuda_arch_sm: 70
         hypre_version: 2.27.0
-    image: mfem/containers/cuda
+    image: mfem-cuda