Add yq, helm3, kustomize

Author: bkildow

.github/workflows/default.yml

@@ -1,12 +1,15 @@
 ---
-name: 'build images'
+name: "build images"
 
 on:
   push:
     branches:
-      - main
+      - master
   workflow_dispatch:
-  
+  pull_request:
+  schedule:
+  - cron: '0 16 * * 0' # Every Sunday at 4PM
+
 jobs:
   build:
     name: "Build: ${{ matrix.version }}"
@@ -16,13 +19,12 @@ jobs:
       fail-fast: false # Don't cancel other jobs if one fails
       matrix:
         include:
-          - version: '7.4'
-          - version: '8.0'
-          - version: '8.1'
-
+          - version: "7.4"
+          - version: "8.0"
+          - version: "8.1"
     env:
       VERSION: ${{ matrix.version }}
-      
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -32,9 +34,8 @@ jobs:
         run: |
           DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/}
           VERSION=php${{ matrix.version }}
-          SHORTREF=${GITHUB_SHA::8}
 
-          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
+          TAGS="${DOCKER_IMAGE}:${VERSION},ghcr.io/${DOCKER_IMAGE}:${VERSION}"
 
           # Set output parameters.
           echo ::set-output name=tags::${TAGS}
@@ -55,9 +56,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-      # -
-      #   name: Login to GitHub Container Registry
-      #   uses: docker/login-action@v1 
+
+      # - 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 }}

build.sh

@@ -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

hooks/build

@@ -38,16 +38,29 @@ RUN curl -o /usr/local/bin/kubectl -LO "https://storage.googleapis.com/kubernete
   ./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-amd64/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" && \
+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 && \
+  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_amd64 /usr/bin/yq
+
 # All further commands will be performed as the docker user.
 USER docker
 SHELL ["/bin/bash", "-c"]