diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-09-27 07:05:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 07:05:45 -0400 |
| commit | 609e2c4accc86ce5279a1c0f445b1031176d9d13 (patch) | |
| tree | f2ce69b5081d79b9d51f03aa481beefbc00c77b5 /.github | |
| parent | fd3de3819816c67f69bea105c1e6a801a568084f (diff) | |
Update to use versioned base images for CI. (#16053)
* Update to use versioned base images for CI.
* Fix typos.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/scripts/get-static-cache-key.sh | 5 | ||||
| -rw-r--r-- | .github/workflows/packaging.yml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/scripts/get-static-cache-key.sh b/.github/scripts/get-static-cache-key.sh index 3b07088f47..5093b33279 100755 --- a/.github/scripts/get-static-cache-key.sh +++ b/.github/scripts/get-static-cache-key.sh @@ -2,13 +2,14 @@ arch="${1}" platform="$(packaging/makeself/uname2platform.sh "${arch}")" +builder_rev="v1" -docker pull --platform "${platform}" netdata/static-builder +docker pull --platform "${platform}" netdata/static-builder:${builder_rev} # shellcheck disable=SC2046 cat $(find packaging/makeself/jobs -type f ! -regex '.*\(netdata\|-makeself\).*') > /tmp/static-cache-key-data -docker run -it --rm --platform "${platform}" netdata/static-builder sh -c 'apk list -I 2>/dev/null' >> /tmp/static-cache-key-data +docker run -it --rm --platform "${platform}" netdata/static-builder:${builder_rev} sh -c 'apk list -I 2>/dev/null' >> /tmp/static-cache-key-data h="$(sha256sum /tmp/static-cache-key-data | cut -f 1 -d ' ')" diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 21a1d3c787..9b15cf94b4 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -228,14 +228,14 @@ jobs: timeout_seconds: 900 command: | docker pull --platform ${{ matrix.platform }} ${{ matrix.base_image }} - docker pull --platform ${{ matrix.platform }} netdata/package-builders:${{ matrix.distro }}${{ matrix.version }} + docker pull --platform ${{ matrix.platform }} netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}-v1 - name: Build Packages id: build if: needs.file-check.outputs.run == 'true' shell: bash run: | docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 -e VERSION=${{ needs.version-check.outputs.version }} \ - --platform=${{ matrix.platform }} -v "$PWD":/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }} + --platform=${{ matrix.platform }} -v "$PWD":/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}-v1 - name: Save Packages id: artifacts if: needs.file-check.outputs.run == 'true' |