[nix-improvements] fix kaniko and manifest-tool

This commit is contained in:
Alex 2024-02-09 11:40:35 +01:00
parent 555ed75548
commit 1be75fbf4e
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 21 additions and 26 deletions

View file

@ -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"

View file

@ -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"