Merge pull request #9 from phase2/update-images

Update images for PHP 8

Author: mike-potter

.github/workflows/default.yml

@@ -0,0 +1,91 @@
+---
+name: "build images"
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+  pull_request:
+  schedule:
+  - cron: '0 16 * * 0' # Every Sunday at 4PM
+
+env:
+  DOCKERHUB_ORG: ${{ secrets.DOCKERHUB_ORG }}
+  DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+jobs:
+  build:
+    name: "Build: ${{ matrix.version }}"
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false # Don't cancel other jobs if one fails
+      matrix:
+        include:
+          - version: "7.4"
+          - version: "8.0"
+          - version: "8.1"
+    env:
+      VERSION: ${{ matrix.version }}
+
+    steps:
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJSON(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Prepare Tags
+        id: prep
+        run: |
+          DOCKERHUB_IMAGE=${DOCKERHUB_ORG}/${GITHUB_REPOSITORY#*/}
+          GITHUB_IMAGE=${{ github.repository_owner }}/${GITHUB_REPOSITORY#*/}
+          VERSION=php${{ matrix.version }}
+
+          TAGS="ghcr.io/${GITHUB_IMAGE}:${VERSION}"
+          # Only push to Dockerhub if secrets are set.
+          if [ ! -z "${DOCKERHUB_ORG}" ]; then
+            TAGS="$TAGS,${DOCKERHUB_IMAGE}:${VERSION}"
+          fi
+
+          # Set output parameters.
+          echo ::set-output name=tags::${TAGS}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        if: ${{ github.event_name != 'pull_request' && env.DOCKERHUB_ORG != '' }}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./src
+          file: ./src/Dockerfile
+          build-args: CLI_VERSION=php${{ matrix.version }}
+          platforms: linux/amd64,linux/arm64
+          push:  ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}

.hadolint.yml

@@ -0,0 +1,2 @@
+ignored:
+  - DL4001

Dockerfile

@@ -1,17 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
-# Arguments: $1 tag, $2 CLI_VERSION
-build() {
-  docker build \
-    --build-arg CLI_VERSION="${2}-${1}" \
-    -t outrigger/cli:"${2}-${1}" \
-    .
-}
-
-build "php7.2" "2.10"
-
-for tag in "php7.3" "php7.4"; do
-  build $tag "2.12"
-done
+# Arguments: $1 CLI_VERSION
+docker build --build-arg CLI_VERSION=php"${1:-8.0}" -t phase2/docker-cli:php"${1:-8.0}" ./src

build.sh

@@ -0,0 +1,52 @@
+ARG CLI_VERSION={{cli_version}}
+
+# Extend the Docksal CLI per https://docs.docksal.io/stack/extend-images/
+FROM docksal/cli:${CLI_VERSION}
+
+# See https://github.com/hadolint/hadolint/wiki/DL4006
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+ARG HELM_VERSION=v2.17.0
+
+# Install kubectl and helm client
+RUN curl -o /usr/local/bin/kubectl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(dpkg --print-architecture)/kubectl" && \
+  chmod +x /usr/local/bin/kubectl && \
+  curl -o ./install_helm.sh https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
+  chmod +x ./install_helm.sh && \
+  ./install_helm.sh -v ${HELM_VERSION} && \
+  helm init --client-only
+
+# Also install helm3 as `helm3`
+RUN curl -s https://get.helm.sh/helm-v3.6.2-linux-"$(dpkg --print-architecture)".tar.gz | sudo tar -C /tmp --no-same-owner -xvzf - linux-"$(dpkg --print-architecture)"/helm --strip-components 1 && \
+    mv /tmp/helm /bin/helm3
+
+# Install Kustomize
+# https://kubectl.docs.kubernetes.io/installation/kustomize/binaries/
+RUN cd /bin/ && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+
+# Install AWS cli
+COPY awscli.pubkey /tmp/
+RUN curl https://awscli.amazonaws.com/awscli-exe-linux-"$(uname -m)".zip -o "awscliv2.zip" && \
+  gpg --import /tmp/awscli.pubkey && \
+  curl -s -o awscliv2.sig https://awscli.amazonaws.com/awscli-exe-linux-"$(uname -m)".zip.sig && \
+  gpg --verify awscliv2.sig awscliv2.zip && \
+  unzip -q awscliv2.zip && \
+  ./aws/install && \
+  rm awscliv2.zip && rm -rf aws
+
+# Install yq
+# https://mikefarah.gitbook.io/yq/#wget
+RUN wget https://github.com/mikefarah/yq/releases/download/v4.21.1/yq_linux_"$(dpkg --print-architecture)".tar.gz -O - |\
+  tar xz && mv yq_linux_"$(dpkg --print-architecture)" /usr/bin/yq
+
+# All further commands will be performed as the docker user.
+USER docker
+SHELL ["/bin/bash", "-c"]
+
+# Install additional global npm dependencies
+RUN \
+  # Initialize the user environment (this loads nvm)
+  . "$HOME"/.profile
+
+# IMPORTANT! Switching back to the root user as the last instruction.
+USER root

hooks/build

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF2Cr7UBEADJZHcgusOJl7ENSyumXh85z0TRV0xJorM2B/JL0kHOyigQluUG
+ZMLhENaG0bYatdrKP+3H91lvK050pXwnO/R7fB/FSTouki4ciIx5OuLlnJZIxSzx
+PqGl0mkxImLNbGWoi6Lto0LYxqHN2iQtzlwTVmq9733zd3XfcXrZ3+LblHAgEt5G
+TfNxEKJ8soPLyWmwDH6HWCnjZ/aIQRBTIQ05uVeEoYxSh6wOai7ss/KveoSNBbYz
+gbdzoqI2Y8cgH2nbfgp3DSasaLZEdCSsIsK1u05CinE7k2qZ7KgKAUIcT/cR/grk
+C6VwsnDU0OUCideXcQ8WeHutqvgZH1JgKDbznoIzeQHJD238GEu+eKhRHcz8/jeG
+94zkcgJOz3KbZGYMiTh277Fvj9zzvZsbMBCedV1BTg3TqgvdX4bdkhf5cH+7NtWO
+lrFj6UwAsGukBTAOxC0l/dnSmZhJ7Z1KmEWilro/gOrjtOxqRQutlIqG22TaqoPG
+fYVN+en3Zwbt97kcgZDwqbuykNt64oZWc4XKCa3mprEGC3IbJTBFqglXmZ7l9ywG
+EEUJYOlb2XrSuPWml39beWdKM8kzr1OjnlOm6+lpTRCBfo0wa9F8YZRhHPAkwKkX
+XDeOGpWRj4ohOx0d2GWkyV5xyN14p2tQOCdOODmz80yUTgRpPVQUtOEhXQARAQAB
+tCFBV1MgQ0xJIFRlYW0gPGF3cy1jbGlAYW1hem9uLmNvbT6JAlQEEwEIAD4WIQT7
+Xbd/1cEYuAURraimMQrMRnJHXAUCXYKvtQIbAwUJB4TOAAULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgAAKCRCmMQrMRnJHXJIXEAChLUIkg80uPUkGjE3jejvQSA1aWuAM
+yzy6fdpdlRUz6M6nmsUhOExjVIvibEJpzK5mhuSZ4lb0vJ2ZUPgCv4zs2nBd7BGJ
+MxKiWgBReGvTdqZ0SzyYH4PYCJSE732x/Fw9hfnh1dMTXNcrQXzwOmmFNNegG0Ox
+au+VnpcR5Kz3smiTrIwZbRudo1ijhCYPQ7t5CMp9kjC6bObvy1hSIg2xNbMAN/Do
+ikebAl36uA6Y/Uczjj3GxZW4ZWeFirMidKbtqvUz2y0UFszobjiBSqZZHCreC34B
+hw9bFNpuWC/0SrXgohdsc6vK50pDGdV5kM2qo9tMQ/izsAwTh/d/GzZv8H4lV9eO
+tEis+EpR497PaxKKh9tJf0N6Q1YLRHof5xePZtOIlS3gfvsH5hXA3HJ9yIxb8T0H
+QYmVr3aIUes20i6meI3fuV36VFupwfrTKaL7VXnsrK2fq5cRvyJLNzXucg0WAjPF
+RrAGLzY7nP1xeg1a0aeP+pdsqjqlPJom8OCWc1+6DWbg0jsC74WoesAqgBItODMB
+rsal1y/q+bPzpsnWjzHV8+1/EtZmSc8ZUGSJOPkfC7hObnfkl18h+1QtKTjZme4d
+H17gsBJr+opwJw/Zio2LMjQBOqlm3K1A4zFTh7wBC7He6KPQea1p2XAMgtvATtNe
+YLZATHZKTJyiqA==
+=vYOk
+-----END PGP PUBLIC KEY BLOCK-----