Fixing base images and workflows (#25)

stewartboogert · web-flow · commit 2ab462287cd9 · 2024-01-14T22:48:15.000Z
* centos7 pointing to wrong base image

* centos7 pointing to workflow
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -484,7 +484,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
   centos7-g4-11-2:
-    needs: [centos8_base]
+    needs: [centos7_base]
     name: Push Centos7 g4.11.2 docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
diff --git a/dockerfiles/centos7-g4.10.7 b/dockerfiles/centos7-g4.10.7
@@ -1,4 +1,4 @@
-FROM sboogert/centos8-base
+FROM sboogert/centos7-base
 
 # CLHEP
 RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
diff --git a/dockerfiles/centos7-g4.11.0 b/dockerfiles/centos7-g4.11.0
@@ -1,4 +1,4 @@
-FROM sboogert/centos8-base
+FROM sboogert/centos7-base
 
 # CLHEP
 RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.5.1.tgz && \
diff --git a/dockerfiles/centos7-g4.11.1 b/dockerfiles/centos7-g4.11.1
@@ -1,4 +1,4 @@
-FROM sboogert/centos8-base
+FROM sboogert/centos7-base
 
 # CLHEP
 RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.6.2.tgz && \
diff --git a/dockerfiles/centos7-g4.11.2 b/dockerfiles/centos7-g4.11.2
@@ -1,4 +1,4 @@
-FROM sboogert/centos8-base
+FROM sboogert/centos7-base
 
 # CLHEP
 RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.7.1.tgz && \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM sboogert/centos8-base`
	`1`	`+FROM sboogert/centos7-base`
`2`	`2`
`3`	`3`	`# CLHEP`
`4`	`4`	`RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \`