From 772e7bc3f017a46fa9aacf143c25d92eee47bd48 Mon Sep 17 00:00:00 2001 From: Alexey Khudyakov Date: Wed, 15 Jul 2020 20:15:11 +0300 Subject: [PATCH 1/2] Use argstr (Nicer) --- nix/build-docker-ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/build-docker-ci.sh b/nix/build-docker-ci.sh index bc28d5108..d07d6e8b3 100755 --- a/nix/build-docker-ci.sh +++ b/nix/build-docker-ci.sh @@ -37,8 +37,8 @@ echo "git tag: $gittag" echo "git event: $gitevent" containers=$(nix-build containers.nix --arg isProd true \ - --arg containerTag \"$tag\" \ - --arg prefixName \"registry.hxr.team/\" ) + --argstr containerTag "$tag" \ + --argstr prefixName registry.hxr.team ) for container in $containers do From ed3d49f3200d9bc9577332cd8e414a2341f6fe4c Mon Sep 17 00:00:00 2001 From: Alexey Khudyakov Date: Wed, 15 Jul 2020 20:24:19 +0300 Subject: [PATCH 2/2] Use same setup stanza --- nix/build-docker-ci.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/build-docker-ci.sh b/nix/build-docker-ci.sh index d07d6e8b3..bb0b236f1 100755 --- a/nix/build-docker-ci.sh +++ b/nix/build-docker-ci.sh @@ -3,7 +3,6 @@ set -e # Configure cache ./setup-cache.sh -export NIX_PATH=$GIT_NIX_PATH$NIX_PATH # Minimal nsswitch.conf [[ ! -e /etc/nsswitch.conf ]] && echo 'hosts: files dns' > /etc/nsswitch.conf