From 8a83e7e9c19797dd050769962714467e99b26637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Sun, 15 Mar 2026 11:30:05 +0000 Subject: [PATCH] build container images - buildkit --- .../buildkit-build-push/action.yaml | 0 .../kubectl-setup/action.yaml | 0 .gitea/workflows/act-network-stack-deploy.yml | 21 ++++++++----------- .../act-runner-network-stack-deploy.yml | 21 ++++++++----------- cloud-scripts/setup-limbo-actions.sh | 2 +- 5 files changed, 19 insertions(+), 25 deletions(-) rename .gitea/{actions => limbo_actions}/buildkit-build-push/action.yaml (100%) rename .gitea/{actions => limbo_actions}/kubectl-setup/action.yaml (100%) diff --git a/.gitea/actions/buildkit-build-push/action.yaml b/.gitea/limbo_actions/buildkit-build-push/action.yaml similarity index 100% rename from .gitea/actions/buildkit-build-push/action.yaml rename to .gitea/limbo_actions/buildkit-build-push/action.yaml diff --git a/.gitea/actions/kubectl-setup/action.yaml b/.gitea/limbo_actions/kubectl-setup/action.yaml similarity index 100% rename from .gitea/actions/kubectl-setup/action.yaml rename to .gitea/limbo_actions/kubectl-setup/action.yaml diff --git a/.gitea/workflows/act-network-stack-deploy.yml b/.gitea/workflows/act-network-stack-deploy.yml index d1e8570..01fcc4e 100644 --- a/.gitea/workflows/act-network-stack-deploy.yml +++ b/.gitea/workflows/act-network-stack-deploy.yml @@ -14,18 +14,15 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Log in to git.limbosolutions.com docker registry - uses: docker/login-action@v3 - with: - registry: git.limbosolutions.com - username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} - password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} - - name: Build and push Docker Image - id: push - uses: docker/build-push-action@v6 + uses: ./.gitea/limbo_actions/buildkit-build-push with: + registry_addr: https://git.limbosolutions.com + registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} + registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} + buildkit_addr: tcp://buildkitd.buildkit.svc.cluster.local:1234 context: ${{gitea.workspace}}/acts/network-stack - file: ${{gitea.workspace}}/acts/network-stack/Dockerfile - push: true - tags: git.limbosolutions.com/kb/gitea/act:latest-network-stack \ No newline at end of file + dockerfile: ${{gitea.workspace}}/acts/network-stack + tags: git.limbosolutions.com/kb/gitea/act:latest-network-stack + + diff --git a/.gitea/workflows/act-runner-network-stack-deploy.yml b/.gitea/workflows/act-runner-network-stack-deploy.yml index c0c02d8..9729597 100644 --- a/.gitea/workflows/act-runner-network-stack-deploy.yml +++ b/.gitea/workflows/act-runner-network-stack-deploy.yml @@ -14,18 +14,15 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Log in to git.limbosolutions.com docker registry - uses: docker/login-action@v3 - with: - registry: git.limbosolutions.com - username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} - password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} - - name: Build and push Docker Image - id: push - uses: docker/build-push-action@v6 + uses: ./.gitea/limbo_actions/buildkit-build-push with: + registry_addr: https://git.limbosolutions.com + registry_username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }} + registry_password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }} + buildkit_addr: tcp://buildkitd.buildkit.svc.cluster.local:1234 context: ${{gitea.workspace}}/act-runners/network-stack - file: ${{gitea.workspace}}/act-runners/network-stack/Dockerfile - push: true - tags: git.limbosolutions.com/kb/gitea/act_runner:0.2.13-network-stack \ No newline at end of file + dockerfile: ${{gitea.workspace}}/act-runners/network-stack + tags: git.limbosolutions.com/kb/gitea/act_runner:0.3-network-stack + + diff --git a/cloud-scripts/setup-limbo-actions.sh b/cloud-scripts/setup-limbo-actions.sh index 7637ea1..6be59bc 100644 --- a/cloud-scripts/setup-limbo-actions.sh +++ b/cloud-scripts/setup-limbo-actions.sh @@ -23,6 +23,6 @@ mkdir -p ${RUNNER_TEMP}/gitea_src mkdir -p ${WORKSPACE}/.gitea/limbo_actions git clone -b main --depth=1 https://git.limbosolutions.com/kb/gitea ${RUNNER_TEMP}/gitea_src -for dir in ${RUNNER_TEMP}/gitea_src/.gitea/actions/*; do +for dir in ${RUNNER_TEMP}/gitea_src/.gitea/limbo_actions/*; do ln -s "$dir" "${WORKSPACE}/.gitea/limbo_actions/$(basename "$dir")" done \ No newline at end of file