From faa27f6c6b85b4a6944db2e46faf927b7e1b53cd Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Sun, 27 Apr 2025 20:34:19 +0200 Subject: [PATCH 01/16] fix --- .github/workflows/build.yaml | 65 +++++++++++++++++++++ Dockerfile | 108 +++++++++++++++++++++++++++++++++++ versions | 5 ++ 3 files changed, 178 insertions(+) create mode 100644 .github/workflows/build.yaml create mode 100644 Dockerfile create mode 100644 versions diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..b0158f0 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,65 @@ +name: Build Runner Image + +on: + push: + tags: + - 'v*.*.*' + pull_request: + types: + - labeled + - opened + - ready_for_review + - reopened + - synchronize + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + # - name: Login to Docker Hub + # uses: docker/login-action@v3 + # with: + # username: ${{ vars.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Read Versions + id: versions + run: | + echo "kubectl=$(grep kubectl versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "gcloud=$(grep gcloud versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "aws_cli=$(grep aws_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "azure_cli=$(grep azure_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "scalr_cli=$(grep scalr_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + + - name: Build Docker image + uses: docker/build-push-action@v6 + with: + build-args: | + KUBECTL_VERSION=${{ steps.versions.outputs.kubectl }} + GCLOUD_VERSION=${{ steps.versions.outputs.gcloud }} + AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} + AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} + SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} + platforms: linux/amd64,linux/arm64 + # cache-from: type=registry,ref=scalr/runner:buildcache + # cache-to: type=registry,ref=scalr/runner:buildcache + load: true + tags: | + scalr/runner:sha-${{ github.sha }} + + - name: Test Docker Image + run: | + docker run --rm scalr/runner:sha-${{ github.sha }} 'gcloud version' + docker run --rm scalr/runner:sha-${{ github.sha }} 'aws --version' + docker run --rm scalr/runner:sha-${{ github.sha }} 'az --version' + docker run --rm scalr/runner:sha-${{ github.sha }} 'kubectl version --client' + docker run --rm scalr/runner:sha-${{ github.sha }} 'scalr -version' \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6542055 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,108 @@ +# Runner Image for the Scalr remote backend +# -------------------------------------------- +# +# Note: This is a PUBLIC image, it should not contain any sensitive data. + +FROM debian:bookworm-slim + +ARG TARGETARCH + +SHELL ["/bin/bash", "-o", "pipefail", "-euxc"] + +# Base Software +RUN < /dev/null + chmod go+r /etc/apt/keyrings/microsoft.gpg + echo "Types: deb +URIs: https://packages.microsoft.com/repos/azure-cli/ +Suites: ${AZ_DIST} +Components: main +Architectures: $(dpkg --print-architecture) +Signed-by: /etc/apt/keyrings/microsoft.gpg" | tee /etc/apt/sources.list.d/azure-cli.sources + apt-get update + apt-get install -y --no-install-recommends "azure-cli=${AZURE_CLI_VERSION}-1~${AZ_DIST}" + # Cleanup + apt-get clean + apt-get autoremove -y + rm -rf /var/lib/apt/lists/* + find /opt/az/lib/python* -regextype grep -regex ".*/tests\?" -exec rm -rf {} + + find /opt/az -name __pycache__ -type d -exec rm -rf {} + +EOT + +# Scalr CLI +ARG SCALR_CLI_VERSION +LABEL scalr-cli.version=${SCALR_CLI_VERSION} +RUN < Date: Sun, 27 Apr 2025 20:37:42 +0200 Subject: [PATCH 02/16] fix --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b0158f0..98986ae 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -49,7 +49,8 @@ jobs: AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 + # platforms: linux/amd64,linux/arm64 # cache-from: type=registry,ref=scalr/runner:buildcache # cache-to: type=registry,ref=scalr/runner:buildcache load: true From aeb8e27cf0834aacc705286e7fed4277de891e47 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Sun, 27 Apr 2025 20:44:20 +0200 Subject: [PATCH 03/16] fix --- .github/workflows/build.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 98986ae..4f481ff 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,6 +14,7 @@ on: jobs: build: + name: Build and Test runs-on: ubuntu-latest steps: - name: Checkout code @@ -59,8 +60,8 @@ jobs: - name: Test Docker Image run: | - docker run --rm scalr/runner:sha-${{ github.sha }} 'gcloud version' - docker run --rm scalr/runner:sha-${{ github.sha }} 'aws --version' - docker run --rm scalr/runner:sha-${{ github.sha }} 'az --version' - docker run --rm scalr/runner:sha-${{ github.sha }} 'kubectl version --client' - docker run --rm scalr/runner:sha-${{ github.sha }} 'scalr -version' \ No newline at end of file + docker run --rm scalr/runner:sha-${{ github.sha }} gcloud version + docker run --rm scalr/runner:sha-${{ github.sha }} aws --version + docker run --rm scalr/runner:sha-${{ github.sha }} az --version + docker run --rm scalr/runner:sha-${{ github.sha }} kubectl version --client + docker run --rm scalr/runner:sha-${{ github.sha }} scalr -version \ No newline at end of file From 6f9bdb33412869f6329e6019d1fb3d8a22cabb6b Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Sun, 27 Apr 2025 21:00:52 +0200 Subject: [PATCH 04/16] fix --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4f481ff..650688d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -50,7 +50,6 @@ jobs: AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} - platforms: linux/amd64 # platforms: linux/amd64,linux/arm64 # cache-from: type=registry,ref=scalr/runner:buildcache # cache-to: type=registry,ref=scalr/runner:buildcache From b8081cc956e522517c99212480e9e0e6693c48cc Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Sun, 27 Apr 2025 21:10:35 +0200 Subject: [PATCH 05/16] fix --- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 650688d..1e3a275 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,8 +59,8 @@ jobs: - name: Test Docker Image run: | - docker run --rm scalr/runner:sha-${{ github.sha }} gcloud version - docker run --rm scalr/runner:sha-${{ github.sha }} aws --version - docker run --rm scalr/runner:sha-${{ github.sha }} az --version - docker run --rm scalr/runner:sha-${{ github.sha }} kubectl version --client - docker run --rm scalr/runner:sha-${{ github.sha }} scalr -version \ No newline at end of file + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'gcloud version' + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'aws --version' + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'az --version' + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'kubectl version --client' + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'scalr -version' \ No newline at end of file From f2f9ce7ca427a5bf862c5f71958cd45a87dd66cf Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Sun, 27 Apr 2025 21:24:33 +0200 Subject: [PATCH 06/16] fix --- .github/workflows/build.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1e3a275..3d25f69 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,14 +20,14 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - # - name: Login to Docker Hub - # uses: docker/login-action@v3 - # with: - # username: ${{ vars.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -51,8 +51,8 @@ jobs: AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} # platforms: linux/amd64,linux/arm64 - # cache-from: type=registry,ref=scalr/runner:buildcache - # cache-to: type=registry,ref=scalr/runner:buildcache + cache-from: type=registry,ref=scalr/runner:buildcache + cache-to: type=registry,ref=scalr/runner:buildcache load: true tags: | scalr/runner:sha-${{ github.sha }} From 6452afd845148e4fca466233fd519706981ee9f7 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 10:48:20 +0200 Subject: [PATCH 07/16] fix --- .github/workflows/build.yaml | 5 +- .github/workflows/release.yaml | 83 ++++++++++++++++++++++++++++++++++ README.md | 2 +- 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3d25f69..7a9b6ef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,7 +17,7 @@ jobs: name: Build and Test runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout uses: actions/checkout@v4 - name: Login to Docker Hub @@ -26,9 +26,6 @@ jobs: username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..8d30b25 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,83 @@ +name: Release Runner Image + +on: + push: + tags: + - 'v*.*.*' + + +jobs: + build: + name: Build and Push + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Read Versions + id: versions + run: | + echo "kubectl=$(grep kubectl versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "gcloud=$(grep gcloud versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "aws_cli=$(grep aws_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "azure_cli=$(grep azure_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "scalr_cli=$(grep scalr_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + + # - name: Build Docker image + # uses: docker/build-push-action@v6 + # with: + # build-args: | + # KUBECTL_VERSION=${{ steps.versions.outputs.kubectl }} + # GCLOUD_VERSION=${{ steps.versions.outputs.gcloud }} + # AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} + # AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} + # SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} + # platforms: linux/amd64,linux/arm64 + # cache-from: type=registry,ref=scalr/runner:buildcache + # cache-to: type=registry,ref=scalr/runner:buildcache + # push: true + # tags: | + # scalr/runner:latest + # scalr/runner:${{ github.ref_name }} + + update_changelog: + name: Update Changelog + runs-on: ubuntu-latest + needs: build + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + + - name: Install Changelog Generator + run: gem install github_changelog_generator + + - name: Update CHANGELOG.md + env: + CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + github_changelog_generator -u Scalr -p runner --token --output + # git add CHANGELOG.md + # if [ ! -n "$(git status -s)" ]; then + # echo "NOTHING TO COMMIT" + # else + # git config user.name "${GITHUB_ACTOR}" + # git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + # git commit -m "Update CHANGELOG.md" + # git push --no-verify + # fi diff --git a/README.md b/README.md index d75614b..fdc0fa7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is the Git repo of the official runner image. -The image is based on the [`debian:bullseye-slim`](https://hub.docker.com/_/debian), +The image is based on the [`debian:bookworm-slim`](https://hub.docker.com/_/debian), and contains the following software: * Archivators - zip, tar, gzip From 194b9ffef6a5102492a57de30a78c36a19a3d636 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 10:50:14 +0200 Subject: [PATCH 08/16] fix --- .github/workflows/build.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7a9b6ef..70c04aa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,8 +2,8 @@ name: Build Runner Image on: push: - tags: - - 'v*.*.*' + branches: + - main pull_request: types: - labeled diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8d30b25..1985b06 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -71,7 +71,7 @@ jobs: env: CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - github_changelog_generator -u Scalr -p runner --token --output + github_changelog_generator -u Scalr -p runner --output # git add CHANGELOG.md # if [ ! -n "$(git status -s)" ]; then # echo "NOTHING TO COMMIT" From 9064006b661ab019b289e8db4e74707b26d0a280 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 10:52:23 +0200 Subject: [PATCH 09/16] fix --- .github/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1985b06..3e080ed 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -71,7 +71,8 @@ jobs: env: CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - github_changelog_generator -u Scalr -p runner --output + github_changelog_generator -u Scalr -p runner --output CHANGELOG.md + cat CHANGELOG.md # git add CHANGELOG.md # if [ ! -n "$(git status -s)" ]; then # echo "NOTHING TO COMMIT" From 18fa292ed0663894b255267b4680e33df73b14b7 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 10:58:52 +0200 Subject: [PATCH 10/16] fix --- .github/workflows/release.yaml | 56 ++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3e080ed..4e38cc4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -35,22 +35,27 @@ jobs: echo "azure_cli=$(grep azure_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT echo "scalr_cli=$(grep scalr_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT - # - name: Build Docker image - # uses: docker/build-push-action@v6 - # with: - # build-args: | - # KUBECTL_VERSION=${{ steps.versions.outputs.kubectl }} - # GCLOUD_VERSION=${{ steps.versions.outputs.gcloud }} - # AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} - # AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} - # SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} - # platforms: linux/amd64,linux/arm64 - # cache-from: type=registry,ref=scalr/runner:buildcache - # cache-to: type=registry,ref=scalr/runner:buildcache - # push: true - # tags: | - # scalr/runner:latest - # scalr/runner:${{ github.ref_name }} + - name: Format Image Tag + id: image_tag + run: | + echo "tag=${GITHUB_REF#refs/tags/v}" | tee -a $GITHUB_OUTPUT + + - name: Build Docker image + uses: docker/build-push-action@v6 + with: + build-args: | + KUBECTL_VERSION=${{ steps.versions.outputs.kubectl }} + GCLOUD_VERSION=${{ steps.versions.outputs.gcloud }} + AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} + AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} + SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} + platforms: linux/amd64,linux/arm64 + cache-from: type=registry,ref=scalr/runner:buildcache + cache-to: type=registry,ref=scalr/runner:buildcache + load: true + tags: | + scalr/runner:latest + scalr/runner:${{ steps.image_tag.outputs.tag }} update_changelog: name: Update Changelog @@ -72,13 +77,12 @@ jobs: CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | github_changelog_generator -u Scalr -p runner --output CHANGELOG.md - cat CHANGELOG.md - # git add CHANGELOG.md - # if [ ! -n "$(git status -s)" ]; then - # echo "NOTHING TO COMMIT" - # else - # git config user.name "${GITHUB_ACTOR}" - # git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" - # git commit -m "Update CHANGELOG.md" - # git push --no-verify - # fi + git add CHANGELOG.md + if [ ! -n "$(git status -s)" ]; then + echo "NOTHING TO COMMIT" + else + git config user.name "${GITHUB_ACTOR}" + git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git commit -m "Update CHANGELOG.md" + git push --no-verify + fi From 5cb6415ff79c6102ef8492d82d5b33c62154545f Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 11:00:38 +0200 Subject: [PATCH 11/16] fix --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4e38cc4..1b3ca5d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ name: Release Runner Image on: push: tags: - - 'v*.*.*' + - '*.*.*' jobs: @@ -38,7 +38,7 @@ jobs: - name: Format Image Tag id: image_tag run: | - echo "tag=${GITHUB_REF#refs/tags/v}" | tee -a $GITHUB_OUTPUT + echo "tag=${GITHUB_REF#refs/tags/}" | tee -a $GITHUB_OUTPUT - name: Build Docker image uses: docker/build-push-action@v6 From 2760c55c39743ba85629492c291804e9261832de Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 11:02:16 +0200 Subject: [PATCH 12/16] fix --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1b3ca5d..9086650 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,7 +52,7 @@ jobs: platforms: linux/amd64,linux/arm64 cache-from: type=registry,ref=scalr/runner:buildcache cache-to: type=registry,ref=scalr/runner:buildcache - load: true + push: false tags: | scalr/runner:latest scalr/runner:${{ steps.image_tag.outputs.tag }} From 4d1c422d1ab871c4f8f046d6f47b3848cda2724c Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 11:17:28 +0200 Subject: [PATCH 13/16] fix --- .github/workflows/release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9086650..e54d15d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,6 +64,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: main - uses: ruby/setup-ruby@v1 with: From 1b12a7868203496d05967b0d2356283dc78b7ba1 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Thu, 1 May 2025 11:21:26 +0200 Subject: [PATCH 14/16] fix --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e54d15d..7a2e7d9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,7 +52,7 @@ jobs: platforms: linux/amd64,linux/arm64 cache-from: type=registry,ref=scalr/runner:buildcache cache-to: type=registry,ref=scalr/runner:buildcache - push: false + push: true tags: | scalr/runner:latest scalr/runner:${{ steps.image_tag.outputs.tag }} From 91753639a90ac884720aaf095adb9d1c288a80cf Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Fri, 2 May 2025 13:59:15 +0200 Subject: [PATCH 15/16] fix --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fdc0fa7..d15c984 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Runner image used in Scalr remote backend. +# Runner Image used in Scalr Remote Backend. This is the Git repo of the official runner image. @@ -7,13 +7,26 @@ and contains the following software: * Archivators - zip, tar, gzip * Encryption - gnupg -* Git (2.30.2) - core, LFS, ssh/http transports +* Git (2.39.5) - core, LFS, ssh/http transports * HTTP clients - curl, wget, ca-certificates * JSON - jq * Python (3.11.2) -* Cloud clients (latest versions): +* Cloud clients (see [versions](./versions)): * AWS CLI * Azure CLI * GCloud - Stable, Alpha, and Beta components. Kubectl authenticator * Kubectl (latest version) * Scalr CLI + +## Runner Image Building + +```bash +docker buildx build \ + --build-arg KUBECTL_VERSION=v1.33.0 \ + --build-arg GCLOUD_VERSION=519.0.0 \ + --build-arg AWS_CLI_VERSION=2.27.1 \ + --build-arg AZURE_CLI_VERSION=2.71.0 \ + --build-arg SCALR_CLI_VERSION=0.17.0 \ + --platform linux/amd64 \ + -t runner:latest --load . +``` \ No newline at end of file From f83700d4e461fee5ec84b3ddf047494c7867b3e4 Mon Sep 17 00:00:00 2001 From: Artem Sukhodolskyi Date: Fri, 2 May 2025 15:41:11 +0200 Subject: [PATCH 16/16] fix --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 70c04aa..8ffb500 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,7 +47,6 @@ jobs: AWS_CLI_VERSION=${{ steps.versions.outputs.aws_cli }} AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} - # platforms: linux/amd64,linux/arm64 cache-from: type=registry,ref=scalr/runner:buildcache cache-to: type=registry,ref=scalr/runner:buildcache load: true