group updates to public branch

lj020326 · May 23, 2024 · 0afee5d · 0afee5d
1 parent f52938c
commit 0afee5d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -74,7 +74,7 @@ jobs:
         with:
           context: ${{ matrix.cicd-build-tools.context }}
           file: ${{ matrix.cicd-build-tools.dockerfile }}
-          build-args: IMAGE_REGISTRY=${{ github.repository_owner }},INTERNAL_IMAGE_BUILD=NO
+#          build-args: IMAGE_REGISTRY=${{ github.repository_owner }},INTERNAL_IMAGE_BUILD=NO
           push: true
           tags: ${{ matrix.cicd-build-tools.tags }}
           labels: |
@@ -87,7 +87,7 @@ jobs:
         with:
           context: ${{ matrix.jenkins-docker-cicd-agent.context }}
           file: ${{ matrix.jenkins-docker-cicd-agent.dockerfile }}
-          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
+#          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
           push: true
           tags: ${{ matrix.jenkins-docker-cicd-agent.tags }}
           labels: |
@@ -100,7 +100,7 @@ jobs:
         with:
           context: ${{ matrix.cicd-docker-in-docker.context }}
           file: ${{ matrix.cicd-docker-in-docker.dockerfile }}
-          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
+#          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
           push: true
           tags: ${{ matrix.cicd-docker-in-docker.tags }}
           labels: |
@@ -113,7 +113,7 @@ jobs:
         with:
           context: ${{ matrix.jenkins-dind-agent.context }}
           file: ${{ matrix.jenkins-dind-agent.dockerfile }}
-          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
+#          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
           push: true
           tags: ${{ matrix.jenkins-dind-agent.tags }}
           labels: |
@@ -126,7 +126,7 @@ jobs:
         with:
           context: ${{ matrix.jenkins-swarm-agent.context }}
           file: ${{ matrix.jenkins-swarm-agent.dockerfile }}
-          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
+#          build-args: IMAGE_REGISTRY=${{ github.repository_owner }}
           push: true
           tags: ${{ matrix.jenkins-swarm-agent.tags }}
           labels: |

diff --git a/.jenkins/docker-build-config.yml b/.jenkins/docker-build-config.yml
@@ -6,6 +6,7 @@ pipeline:
 
   buildArgs:
     IMAGE_REGISTRY: media.johnson.int:5000
+    BASE_IMAGE_LABEL: lj020326/cicd-build-tools
 
   buildImageList:
     - buildImageLabel: "cicd-build-tools"

diff --git a/image/cicd-build-tools/Dockerfile b/image/cicd-build-tools/Dockerfile
@@ -4,7 +4,7 @@
 FROM ubuntu:22.04
 LABEL maintainer="Lee Johnson <ljohnson@dettonville.org>"
 ARG BUILD_ID=devel
-ARG BUILD_DATE="2024-05-01
+ARG BUILD_DATE="2024-05-01"
 LABEL build_date=$BUILD_DATE
 LABEL build=$BUILD_ID
 

diff --git a/image/cicd-docker-in-docker/Dockerfile b/image/cicd-docker-in-docker/Dockerfile
@@ -46,9 +46,12 @@ RUN addgroup -g ${gid} ${group} \
 
 # Adding the default user to groups used by Docker engine
 # "docker" for avoiding sudo, and "dockremap" if you enable user namespacing
+#RUN addgroup docker \
+#  && addgroup ${user} docker \
+#  && addgroup ${user} dockremap
 RUN addgroup docker \
-  && addgroup ${user} docker \
-  && addgroup ${user} dockremap
+  && adduser ${user} docker  \
+  && adduser ${user} dockremap
 
 # Custom start script
 COPY ./entrypoint.sh /usr/local/bin/entrypoint.sh

diff --git a/image/jenkins-cicd-agent/Dockerfile b/image/jenkins-cicd-agent/Dockerfile
@@ -1,6 +1,7 @@
 ## ref: https://schneide.blog/2019/10/21/using-parameterized-docker-builds/
-ARG IMAGE_REGISTRY=lj020326
-ARG BASE_IMAGE_LABEL=cicd-build-tools
+ARG IMAGE_REGISTRY=docker.io
+ARG BASE_IMAGE_LABEL=lj020326/cicd-build-tools
+FROM $IMAGE_REGISTRY/$BASE_IMAGE_LABEL
 ARG BUILD_ID=devel
 ARG BUILD_DATE="2024-05-01"
 

diff --git a/image/jenkins-dind-agent/Dockerfile b/image/jenkins-dind-agent/Dockerfile
@@ -1,6 +1,6 @@
 ## ref: https://schneide.blog/2019/10/21/using-parameterized-docker-builds/
-ARG IMAGE_REGISTRY=lj020326
-ARG BASE_IMAGE_LABEL=cicd-docker-in-docker
+ARG IMAGE_REGISTRY=docker.io
+ARG BASE_IMAGE_LABEL=lj020326/cicd-docker-in-docker
 ARG BUILD_ID=devel
 ARG BUILD_DATE="2024-05-01"
 

diff --git a/image/jenkins-swarm-agent/Dockerfile b/image/jenkins-swarm-agent/Dockerfile
@@ -1,7 +1,7 @@
 ## ref: https://hourperday.wordpress.com/2017/05/17/how-to-cicd-with-chef-cookbooks-and-jenkins-part-three/
 ## ref: https://schneide.blog/2019/10/21/using-parameterized-docker-builds/
-ARG IMAGE_REGISTRY=lj020326
-ARG BASE_IMAGE_LABEL=cicd-build-tools
+ARG IMAGE_REGISTRY=docker.io
+ARG BASE_IMAGE_LABEL=lj020326/cicd-build-tools
 ARG BUILD_ID=devel
 ARG BUILD_DATE="2024-05-01"