diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 584e4fc..e1f8cfd 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -16,6 +16,8 @@ on: env: PACK_VERSION: "0.27.0" + YQ_VERSION: "4.25.3" + JQ_VERSION: "1.6" COMPOSER_AUTH: "{\"github-oauth\":{\"github.com\":\"${{ secrets.HVG_DEV_GH_TOKEN }}\"}}" jobs: @@ -55,8 +57,38 @@ jobs: --max-time 60 \ "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \ | tar -C "${PWD}/bin" -xz pack + - name: Setup YQ + run: | + echo "Installing yq ${YQ_VERSION}" + curl \ + --show-error \ + --silent \ + --location \ + --fail \ + --retry 3 \ + --connect-timeout 5 \ + --max-time 60 \ + "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64.tar.gz" \ + | tar -C "${PWD}/bin" --transform='flags=r;s|yq_linux_amd64|yq|' -xz --wildcards 'yq' + - name: Setup JQ + run: | + echo "Installing jq ${JQ_VERSION}" + mkdir -p "${PWD}/bin" + curl \ + --show-error \ + --silent \ + --location \ + --fail \ + --retry 3 \ + --connect-timeout 5 \ + --max-time 60 \ + -o "${PWD}/bin/jq" + "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-${JQ_VERSION}.tar.gz" + chmod +x "${PWD}/bin/jq" - name: Build Image with pack run: | + [[ ! -z $(bin/yq e '. | keys' Procfile | cut -c 3- | grep bash) ]] \ + || echo 'bash: bash -l' >> Procfile bin/pack build "ghcr.io/hvg/blog:$TAG" \ --builder heroku/buildpacks:20 \ --descriptor project.toml \