Fix version of nixos/nix image to 2.3.6

VirtusLab · May 1, 2021 · 0ec951c · 0ec951c
1 parent 0bfab55
commit 0ec951c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ci/deb-ppa-upload/ci-deploy.sh b/ci/deb-ppa-upload/ci-deploy.sh
@@ -13,7 +13,7 @@ export DIRECTORY_HASH
 cd ci/deb-ppa-upload/
 
 # If the image corresponding to the current state of ci/deb-ppa-upload/ is missing, build it and push to Docker Hub.
-docker-compose pull deb-ppa-upload
+docker-compose --no-ansi pull deb-ppa-upload
 # A very unpleasant workaround for https://github.com/docker/compose/issues/7258
 # (since v1.25.1, `docker-compose pull` is NOT failing when it can't fetch the image).
 image_tag=$(docker-compose config | yq eval '.services.deb-ppa-upload.image' -)

diff --git a/ci/nixpkgs-pr/Dockerfile b/ci/nixpkgs-pr/Dockerfile
@@ -1,4 +1,4 @@
-FROM nixos/nix
+FROM nixos/nix:2.3.6
 
 RUN nix-env -i autoconf bash curl git hub jq
 

diff --git a/ci/nixpkgs-pr/ci-deploy.sh b/ci/nixpkgs-pr/ci-deploy.sh
@@ -19,7 +19,7 @@ export VERSION
 cd ci/nixpkgs-pr/
 
 # If the image corresponding to the current state of ci/nixpkgs-pr/ is missing, build it and push to Docker Hub.
-docker-compose pull nixpkgs-pr
+docker-compose --no-ansi pull nixpkgs-pr
 # A very unpleasant workaround for https://github.com/docker/compose/issues/7258
 # (since v1.25.1, `docker-compose pull` is NOT failing when it can't fetch the image).
 image_tag=$(docker-compose config | yq eval '.services.nixpkgs-pr.image' -)

diff --git a/ci/rpm/ci-run.sh b/ci/rpm/ci-run.sh
@@ -7,7 +7,7 @@ export DIRECTORY_HASH
 cd ci/rpm/
 
 # If the image corresponding to the current state of ci/rpm/ is missing, build it and push to Docker Hub.
-docker-compose pull rpm
+docker-compose --no-ansi pull rpm
 # A very unpleasant workaround for https://github.com/docker/compose/issues/7258
 # (since v1.25.1, `docker-compose pull` is NOT failing when it can't fetch the image).
 image_tag=$(docker-compose config | yq eval '.services.rpm.image' -)