From e403bdc4bfa407fbf42a6f09cca6552ea3606474 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 15 Sep 2021 13:55:49 +0200 Subject: [PATCH] chore(gitlab-ci): ... --- .gitlab-ci/make-minio-bucket.sh | 2 +- .gitlab-ci/upload-to-cache.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/make-minio-bucket.sh b/.gitlab-ci/make-minio-bucket.sh index 3797ba0b0..e5e94c3fe 100755 --- a/.gitlab-ci/make-minio-bucket.sh +++ b/.gitlab-ci/make-minio-bucket.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bash -p coreutils -p minio-client -export MC_HOST_minio=http://$(cat /minio-gitlab-runner-cache/accesskey):$(cat /minio-gitlab-runner-cache/secretkey)@minio-gitlab-runner-cache:9000 +export MC_HOST_minio=http://$(cat /minio-gitlab-runner-cache/accesskey):$(cat /minio-gitlab-runner-cache/secretkey)@minio-gitlab-runner-cache mc mb --ignore-existing minio/nix-cache diff --git a/.gitlab-ci/upload-to-cache.sh b/.gitlab-ci/upload-to-cache.sh index ca79c1f02..8687983d7 100755 --- a/.gitlab-ci/upload-to-cache.sh +++ b/.gitlab-ci/upload-to-cache.sh @@ -5,4 +5,4 @@ set -f # disable globbing export IFS=' ' echo "Signing and uploading paths" $OUT_PATHS -exec nix copy --to "s3://nix-cache?scheme=http&endpoint=minio-gitlab-runner-cache:9000&secret-key=${NIX_CACHE_KEYFILE}" $OUT_PATHS +exec nix copy --to "s3://nix-cache?scheme=http&endpoint=minio-gitlab-runner-cache&secret-key=${NIX_CACHE_KEYFILE}" $OUT_PATHS