Merge pull request #48 from fullstack-devops/feature/dump-ghcr-pkg

feat: dump ghcr and move to quai.io

Author: eksrha

.github/workflows/build-pr.yml

@@ -18,37 +18,37 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - id: set-matrix
         working-directory: images
         run: |
           flavours=$(ls -I "base"| xargs echo | sed 's/ /,/g')
           echo "Building flavours: $flavours"
           flavours="{\"flavour\":[\"`echo "$flavours" | sed 's/,/","/g'`\"]}"
-          echo "::set-output name=matrix::$flavours"
+          echo "matrix=$flavours" >> $GITHUB_OUTPUT
 
   build_base:
     runs-on: ubuntu-latest
     needs: generate_infos
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build github-actions-runner:base
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./images/base
           push: true
@@ -62,28 +62,28 @@ jobs:
       matrix: ${{ fromJson(needs.load_matrix.outputs.matrix) }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: link child image to current pr
         run: |
           sed -i --expression "s@FROM ${{ env.IMAGE_BASE }}.*@FROM ${{ env.IMAGE_BASE }}:base-pr-${{ github.event.pull_request.number }}@g" \
           images/${{ matrix.flavour }}/Dockerfile
 
       - name: Build github-actions-runner:${{ matrix.flavour }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./images/${{ matrix.flavour }}
           push: true

.github/workflows/cleanup-pr.yml

@@ -11,14 +11,14 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - id: set-matrix
         working-directory: images
         run: |
           flavours=$(ls -I "base"| xargs echo | sed 's/ /,/g')
           echo "Building flavours: $flavours"
           flavours="{\"flavour\":[\"`echo "$flavours" | sed 's/,/","/g'`\"]}"
-          echo "::set-output name=matrix::$flavours"
+          echo "matrix=$flavours" >> $GITHUB_OUTPUT
 
   purge_images:
     runs-on: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
       matrix: ${{ fromJson(needs.load_matrix.outputs.matrix) }}
     steps:
       - name: Delete github-actions-runner:${{ matrix.flavour }}
-        uses: bots-house/[email protected].0
+        uses: bots-house/[email protected].1
         with:
           owner: ${{ github.repository_owner }}
           name: github-actions-runner

.github/workflows/create-release.yml

@@ -24,42 +24,42 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - id: set-matrix
         working-directory: images
         run: |
           flavours=$(ls -I "base"| xargs echo | sed 's/ /,/g')
           echo "Building flavours: $flavours"
           flavours="{\"flavour\":[\"`echo "$flavours" | sed 's/,/","/g'`\"]}"
-          echo "::set-output name=matrix::$flavours"
+          echo "matrix=$flavours" >> $GITHUB_OUTPUT
 
   build_base:
     runs-on: ubuntu-latest
     needs: create_release
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Red Hat Quay
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.RH_QUAY_USERNAME }}
           password: ${{ secrets.RH_QUAY_PASSWORD }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build github-actions-runner:base
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./images/base
           push: true
@@ -78,39 +78,31 @@ jobs:
       matrix: ${{ fromJson(needs.load_matrix.outputs.matrix) }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Red Hat Quay
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.RH_QUAY_USERNAME }}
           password: ${{ secrets.RH_QUAY_PASSWORD }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: link child image to current version
         run: |
           sed -i --expression "s@FROM ghcr.io/${{ env.IMAGE_NAME }}.*@FROM ghcr.io/${{ env.IMAGE_NAME }}:${{needs.create_release.outputs.version}}-base@g" \
           images/${{ matrix.flavour }}/Dockerfile
 
       - name: Build github-actions-runner:${{ matrix.flavour }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./images/${{ matrix.flavour }}
           push: true
           tags: |
-            ghcr.io/${{ env.IMAGE_NAME }}:latest-${{ matrix.flavour }}
-            ghcr.io/${{ env.IMAGE_NAME }}:${{needs.create_release.outputs.version}}-${{ matrix.flavour }}
             quay.io/${{ env.IMAGE_NAME }}:latest-${{ matrix.flavour }}
             quay.io/${{ env.IMAGE_NAME }}:${{needs.create_release.outputs.version}}-${{ matrix.flavour }}
 
@@ -119,7 +111,7 @@ jobs:
     needs: [create_release, build_base, build_flavours]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup awesome-ci
         uses: fullstack-devops/awesome-ci-action@main
 

README.md

@@ -11,7 +11,7 @@ Software builds can be built there using a [Nexus Repository](https://de.sonatyp
 
 Support: If you need help or a feature just open an issue!
 
-Package / Images: `ghcr.io/fullstack-devops/github-actions-runner`
+Package / Images: `quay.io/fullstack-devops/github-actions-runner`
 
 Available Tags:
 
@@ -60,13 +60,13 @@ If you are using `docker` or `podman` the options and commands are basically the
 Run registerd to an Organisation:
 
 ```bash
-docker run -e GH_ORG=fullstack-devops -e GH_ACCESS_TOKEN=ghp_**** ghcr.io/fullstack-devops/github-actions-runner:latest-base
+docker run -e GH_ORG=fullstack-devops -e GH_ACCESS_TOKEN=ghp_**** quay.io/fullstack-devops/github-actions-runner:latest-base
 ```
 
 Run registerd to an Organisation and Repo:
 
 ```bash
-docker run -e GH_ORG=fullstack-devops -e GH_REPO=github-runner-testing -e GH_ACCESS_TOKEN=ghp_**** ghcr.io/fullstack-devops/github-actions-runner:latest-base
+docker run -e GH_ORG=fullstack-devops -e GH_REPO=github-runner-testing -e GH_ACCESS_TOKEN=ghp_**** quay.io/fullstack-devops/github-actions-runner:latest-base
 ```
 
 > Replace the `ghp_****` with your own valid personal access token
@@ -114,15 +114,15 @@ spec:
       emptyDir: {}
   containers:
     - name: kaniko
-      image: ghcr.io/fullstack-devops/github-actions-runner:latest-kaniko-sidecar
+      image: quay.io/fullstack-devops/github-actions-runner:latest-kaniko-sidecar
       resources: {}
       volumeMounts:
         - name: workspace-volume
           mountPath: /kaniko/workspace/
       imagePullPolicy: IfNotPresent
       tty: true
     - name: github-actions-runner
-      image: ghcr.io/fullstack-devops/github-actions-runner:latest-base
+      image: quay.io/fullstack-devops/github-actions-runner:latest-base
       resources: {}
       env:
         - name: GH_ORG

examples/docker-compose/docker-compose.yml

@@ -6,7 +6,7 @@ volumes:
 
 services:
   github-action-runner:
-    image: ghcr.io/fullstack-devops/github-actions-runner:base-latest
+    image: quay.io/fullstack-devops/github-actions-runner:base-latest
     environment:
       GH_ORG: fullstack-devops
       KANIKO_ENABLED: "true"
@@ -15,6 +15,6 @@ services:
       - kaniko_workspace:/kaniko/workspace
 
   github-action-runner-kaniko:
-    image: ghcr.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
+    image: quay.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
     volumes:
       - kaniko_workspace:/kaniko/workspace

examples/podman/deployment.yml

@@ -11,15 +11,15 @@ spec:
         type: Directory
   containers:
     - name: kaniko
-      image: ghcr.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
+      image: quay.io/fullstack-devops/github-actions-runner:kaniko-sidecar-latest
       resources: {}
       volumeMounts:
         - name: workspace-volume
           mountPath: /kaniko/workspace/
       imagePullPolicy: IfNotPresent
       tty: true
     - name: github-actions-runner
-      image: ghcr.io/fullstack-devops/github-actions-runner:base-latest
+      image: quay.io/fullstack-devops/github-actions-runner:base-latest
       resources: {}
       env:
         - name: GH_ORG

images/ansible-k8s/Dockerfile

@@ -56,6 +56,6 @@ RUN pip3 install ${PACKAGES_PYTHON} --user
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
 
 # install helm plugins helm push, appr && diff
-RUN helm plugin install --version 0.10.2 https://github.com/chartmuseum/helm-push.git \
+RUN helm plugin install --version 0.10.3 https://github.com/chartmuseum/helm-push.git \
   && helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \
-  && helm plugin install --version 3.4.2 https://github.com/databus23/helm-diff
+  && helm plugin install --version 3.6.0 https://github.com/databus23/helm-diff

images/base/Dockerfile

@@ -26,20 +26,24 @@ RUN mkdir /helper-scripts \
   && mkdir -p /kaniko/workspace
 
 # Copy image helper scripts
-ADD ./helper-scripts/detect-setup.sh /helper-scripts/detect-setup.sh
-ADD ./helper-scripts/gh-entrypoint.sh /helper-scripts/gh-entrypoint.sh
-ADD ./helper-scripts/kaniko-wrapper.sh /helper-scripts/kaniko-wrapper.sh
-ADD ./helper-scripts/translate-aarch.sh /helper-scripts/translate-aarch.sh
+ADD ./helper-scripts/ /helper-scripts/
 
 RUN chmod -R 755 /helper-scripts
 
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
 RUN apt-get update \
+  && curl -sL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y ${PACKAGES} \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
+# install nodejs
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - \
+  && apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/* \
+  && apt-get clean
+
 # install awesoeme ci
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short)  \
   && curl -L -O https://github.com/fullstack-devops/awesome-ci/releases/download/${AWESOME_CI_VERSION}/awesome-ci_${AWESOME_CI_VERSION}_linux-${ARCH} \

images/golang/Dockerfile

@@ -3,7 +3,7 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="nodejs ansible"
+ARG PACKAGES="ansible"
 ARG PACKAGES_PYTHON="kubernetes"
 
 ## ansible keys
@@ -54,6 +54,6 @@ RUN pip3 install $PACKAGES_PYTHON --user
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
 
 # install helm plugins helm push, appr && diff
-RUN helm plugin install --version 0.10.2 https://github.com/chartmuseum/helm-push.git \
+RUN helm plugin install --version 0.10.3 https://github.com/chartmuseum/helm-push.git \
   && helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \
-  && helm plugin install --version 3.4.2 https://github.com/databus23/helm-diff
+  && helm plugin install --version 3.6.0 https://github.com/databus23/helm-diff

images/maven-adopt-8-ng/Dockerfile

@@ -3,7 +3,7 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="adoptopenjdk-8-hotspot xmlstarlet maven nodejs ansible"
+ARG PACKAGES="adoptopenjdk-8-hotspot xmlstarlet maven ansible"
 ARG PACKAGES_PYTHON="kubernetes"
 
 ## ansible keys
@@ -56,6 +56,6 @@ RUN pip3 install $PACKAGES_PYTHON --user
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
 
 # install helm plugins helm push, appr && diff
-RUN helm plugin install --version 0.10.2 https://github.com/chartmuseum/helm-push.git \
+RUN helm plugin install --version 0.10.3 https://github.com/chartmuseum/helm-push.git \
   && helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \
-  && helm plugin install --version 3.4.2 https://github.com/databus23/helm-diff
+  && helm plugin install --version 3.6.0 https://github.com/databus23/helm-diff