Merge 301eef3 into sapling-pr-archive-ktf

Author: ktf

.github/workflows/check-image-definitions.yml

@@ -19,7 +19,11 @@ jobs:
       - name: Install prerequisites
         run: |
           sudo apt update -y
-          sudo apt install -y packer
+
+          # The packer provided by Ubuntu repos is ancient
+          curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+          sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+          sudo apt-get update && sudo apt-get install packer
           packer plugins install github.com/hashicorp/docker
 
       - name: Validate Packer images

.github/workflows/push-docker-image.yml

@@ -10,7 +10,7 @@ name: Push Docker image
       image-name:
         description: Docker image to build
         required: true
-        default: slc8-builder
+        default: slc9-builder
 
 permissions:
   contents: read
@@ -20,38 +20,48 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    # GitHub seems to install an odd version of docker on the host, so run in a
-    # container and only connect to the host's docker daemon.
-    container:
-      image: ubuntu:22.04
-      volumes:
-        # Connect to host's docker daemon so we don't run docker inside docker.
-        - /var/run/docker.sock:/var/run/docker.sock
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
+      # Some images are too large and we run out of disk space, so try to free some
+      - name: Free disk space
+        run: |
+          # https://github.com/jlumbroso/free-disk-space
+          set -ex
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /opt/ghc || true
+          sudo rm -rf /usr/local/.ghcup || true
+          sudo docker image prune --all --force || true
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true
+
       - name: Install prerequisites
         run: |
-          apt update -y
-          apt install -y software-properties-common
-          add-apt-repository universe
-          apt install -y docker.io packer
+          sudo apt update -y
+          sudo apt install -y software-properties-common
+          sudo add-apt-repository universe
+
+          # containerd.io conflicts with docker.io
+          sudo apt-get remove containerd.io
+          sudo apt install -y docker.io
+
+          # The packer provided by Ubuntu repos is ancient
+          curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+          sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+          sudo apt-get update && sudo apt-get install packer
           packer plugins install github.com/hashicorp/docker
         env:
           DEBIAN_FRONTEND: noninteractive
 
-      - name: Log in to Docker repos
+      - name: Log in to Docker repo
         run: |
           docker login registry.cern.ch -u '${{ secrets.CERN_REGISTRY_USER }}' --password-stdin <<\EOF
           ${{ secrets.CERN_REGISTRY_PASSWORD }}
           EOF
-          docker login docker.io -u '${{ secrets.DOCKERHUB_USER }}' --password-stdin <<\EOF
-          ${{ secrets.DOCKERHUB_PASSWORD }}
-          EOF
 
       - name: Build and push docker image
         run: |
@@ -61,3 +71,4 @@ jobs:
           fi
           packer validate packer.json
           packer build packer.json
+          docker push registry.cern.ch/alisw/${{ github.event.inputs.image-name }}

README.md

@@ -8,28 +8,6 @@
 - elasticsearch: a customized elasticsearch instance with HEAD and Marvel plugins
   installed.
 
-## Building images with packer
+## Building images
 
-Newer images have a `packer.json` file, which allows them to be built using
-Hashicorp [packer](https://www.packer.io). This has the nice advantage that we
-can customize and upload the images in one go. To build them:
-
-```bash
-brew install packer # > 0.10.0
-cd <image-name>
-packer build packer.json
-```
-
-If you don't want to upload the finished image to DockerHub (e.g. if you're just
-testing changes to the image, or you don't have the rights to upload), remove
-the `"docker-push"` entry from `"post-processors"` in the `packer.json` you're
-using. (JSON doesn't allow trailing commas in arrays, so don't forget to remove
-the comma as well!)
-
-## Building with docker
-
-Older images without a `packer.json` can be built with:
-
-```bash
-docker build -t alisw/<image-name> <image-name>
-```
+This documentation has moved to [alisw.github.io](https://alisw.github.io/infrastructure-docker-packer)

arm64-builder/packer.json

@@ -33,7 +33,10 @@
         "repository": "{{user `project`}}/arm64-builder",
         "tag": "latest"
       },
-      "docker-push"
+      {
+        "type": "shell-local",
+        "inline": ["echo 'The image was built successfully. To push the image to the registry, you can run: docker push {{user `REPO`}}:{{user `TAG`}}'"]
+      }
     ]
   ]
 }