diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-09 11:40:35 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-09 11:46:46 +0100 |
| commit | 1be75fbf4e750d03e1f091016ef44814da674126 (patch) | |
| tree | 2bd0d4ca4e9f933cbdb02a21032660317dc9af61 | |
| parent | 555ed75548d2f42f9d86cc2b8d6844e6b7d35740 (diff) | |
| download | garage-1be75fbf4e750d03e1f091016ef44814da674126.tar.gz garage-1be75fbf4e750d03e1f091016ef44814da674126.zip | |
[nix-improvements] fix kaniko and manifest-tool
| -rw-r--r-- | .woodpecker/publish.yaml | 21 | ||||
| -rw-r--r-- | .woodpecker/release.yaml | 26 |
2 files changed, 21 insertions, 26 deletions
diff --git a/.woodpecker/publish.yaml b/.woodpecker/publish.yaml index 17b33d7f..739af2c4 100644 --- a/.woodpecker/publish.yaml +++ b/.woodpecker/publish.yaml @@ -18,15 +18,12 @@ steps: - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf - nix-shell --attr ci --run "refresh_index" -# - name: multiarch-docker -# image: nixpkgs/nix:nixos-22.05 -# environment: -# HOME: "/root" -# secrets: -# - docker_auth -# commands: -# - mkdir -p /root/.docker -# - echo $DOCKER_AUTH > /root/.docker/config.json -# - sha512sum /root/.docker/config.json -# - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} -# - nix-shell --attr ci --run "multiarch_docker" + - name: multiarch-docker + image: nixpkgs/nix:nixos-22.05 + secrets: + - docker_auth + commands: + - mkdir -p /root/.docker + - echo $DOCKER_AUTH > /root/.docker/config.json + - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} + - nix-shell --attr ci --run "multiarch_docker" diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index e5db48b8..8f19be82 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -56,17 +56,15 @@ steps: commands: - nix-shell --attr ci --run "to_s3_woodpecker" -# - name: docker build and publish -# image: nixpkgs/nix:nixos-22.05 -# environment: -# DOCKER_PLATFORM: "linux/${ARCH}" -# CONTAINER_NAME: "dxflrs/${ARCH}_garage" -# HOME: "/kaniko" -# secrets: -# - docker_auth -# commands: -# - mkdir -p /kaniko/.docker -# - echo $DOCKER_AUTH > /kaniko/.docker/config.json -# - sha512sum /kaniko/.docker/config.json -# - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} -# - nix-shell --attr ci --run "to_docker" + - name: docker build and publish + image: nixpkgs/nix:nixos-22.05 + environment: + DOCKER_PLATFORM: "linux/${ARCH}" + CONTAINER_NAME: "dxflrs/${ARCH}_garage" + secrets: + - docker_auth + commands: + - mkdir -p /root/.docker + - echo $DOCKER_AUTH > /root/.docker/config.json + - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} + - nix-shell --attr ci --run "to_docker" |