From c81c21478a938fcab4553efc1cb2785fc5586ab7 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Fri, 29 Aug 2025 20:19:58 +0000 Subject: [PATCH] test: use docker buildx bake Signed-off-by: Xe Iaso --- test/git-clone/docker-compose.yaml | 2 +- test/git-clone/test.sh | 4 +--- test/git-push/test.sh | 5 ++--- test/healthcheck/test.sh | 5 ++--- test/lib/lib.sh | 11 +---------- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/test/git-clone/docker-compose.yaml b/test/git-clone/docker-compose.yaml index 554bbe48..88558a33 100644 --- a/test/git-clone/docker-compose.yaml +++ b/test/git-clone/docker-compose.yaml @@ -10,7 +10,7 @@ services: - ./var/repos:/srv/git anubis: - image: ko.local/anubis + image: ghcr.io/techarohq/anubis:devel-docker environment: BIND: ":8005" TARGET: http://cgit:80 diff --git a/test/git-clone/test.sh b/test/git-clone/test.sh index 94ad6638..26fcb647 100755 --- a/test/git-clone/test.sh +++ b/test/git-clone/test.sh @@ -9,9 +9,7 @@ set -u ( cd ../.. && \ - npm ci && \ - npm run assets \ - ko build --platform=all --base-import-paths --tags="latest" --image-user=1000 --image-annotation="" --image-label="" ./cmd/anubis -L + docker buildx bake ) rm -rf ./var/repos ./var/clones diff --git a/test/git-push/test.sh b/test/git-push/test.sh index 35ed9fe3..ef15328a 100755 --- a/test/git-push/test.sh +++ b/test/git-push/test.sh @@ -9,11 +9,10 @@ set -u ( cd ../.. && \ - npm ci && \ - npm run assets \ - ko build --platform=all --base-import-paths --tags="latest" --image-user=1000 --image-annotation="" --image-label="" ./cmd/anubis -L + docker buildx bake ) + rm -rf ./var/repos ./var/foo mkdir -p ./var/repos diff --git a/test/healthcheck/test.sh b/test/healthcheck/test.sh index 33f0a19b..b3a30258 100755 --- a/test/healthcheck/test.sh +++ b/test/healthcheck/test.sh @@ -9,11 +9,10 @@ set -u ( cd ../.. && \ - npm ci && \ - npm run assets \ - ko build --platform=all --base-import-paths --tags="latest" --image-user=1000 --image-annotation="" --image-label="" ./cmd/anubis -L + docker buildx bake ) + docker compose up -d attempt=1 diff --git a/test/lib/lib.sh b/test/lib/lib.sh index 2fc0b11b..6026f84f 100644 --- a/test/lib/lib.sh +++ b/test/lib/lib.sh @@ -17,16 +17,7 @@ function build_anubis_ko() { cd $REPO_ROOT && npm ci && npm run assets ) ( - cd $REPO_ROOT && - VERSION=devel ko build \ - --platform=all \ - --base-import-paths \ - --tags="latest" \ - --image-user=1000 \ - --image-annotation="" \ - --image-label="" \ - ./cmd/anubis \ - --local + cd $REPO_ROOT && docker buildx bake ) }