From 2b8f626566a83695dc81166cd045f50f5fef9555 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Wed, 4 Jan 2023 00:54:55 -0500 Subject: [PATCH] Fix deps and secret injection Signed-off-by: Brett Logan --- .github/workflows/deploy-production.yml | 2 +- Makefile | 3 +-- scripts/install-phive.sh | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index bc996d9f..a4c71d37 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -57,7 +57,7 @@ jobs: load: true push: false secrets: | - GITHUB_TOKEN=GITHUB_TOKEN${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} tags: | ghcr.io/github/super-linter:${{ matrix.images.container-image-id-prefix }}${{ github.sha }} ghcr.io/github/super-linter:${{ matrix.images.container-image-id-prefix }}test diff --git a/Makefile b/Makefile index 20142d13..51b2ffeb 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,6 @@ docker: --build-arg BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg BUILD_REVISION=$(shell git rev-parse --short HEAD) \ --build-arg BUILD_VERSION=$(shell git rev-parse --short HEAD) \ - --build-arg GITHUB_TOKEN="${GITHUB_PAT}" \ -t ghcr.io/github/super-linter . .phony: docker-buildx @@ -121,5 +120,5 @@ docker-buildx: --build-arg BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg BUILD_REVISION=$(shell git rev-parse --short HEAD) \ --build-arg BUILD_VERSION=$(shell git rev-parse --short HEAD) \ - --build-arg GITHUB_TOKEN="${GITHUB_PAT}" \ + --secret id=GITHUB_TOKEN,env=GITHUB_TOKEN \ -t ghcr.io/github/super-linter . diff --git a/scripts/install-phive.sh b/scripts/install-phive.sh index e89dd7e6..45ca42ac 100755 --- a/scripts/install-phive.sh +++ b/scripts/install-phive.sh @@ -13,13 +13,13 @@ curl --retry 5 --retry-delay 5 -sL -o "glibc-${GLIBC_VERSION}.apk" \ -H "Accept: application/octet-stream" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ "${url}" -apk add --no-cache \ +apk add --no-cache --force-overwrite \ bash \ ca-certificates \ "glibc-${GLIBC_VERSION}.apk" \ gnupg \ - php7 php7-curl php7-ctype php7-dom php7-iconv php7-json php7-mbstring \ - php7-openssl php7-phar php7-simplexml php7-tokenizer php-xmlwriter \ + php81 php81-curl php81-ctype php81-dom php81-iconv php81-mbstring \ + php81-openssl php81-phar php81-simplexml php81-tokenizer php81-xmlwriter \ tar zstd rm "glibc-${GLIBC_VERSION}.apk" mkdir /tmp/libz