CircleCI: use tlaurion/heads-dev-env:v0.1.1 which reverts nix attempt of garbage collection inside of nix prior of making the docker

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2024-05-03 15:00:26 -04:00
parent 0b7ce534a8
commit 2b2356e87e
No known key found for this signature in database
GPG Key ID: 9A53E1BB3FF00461
2 changed files with 13 additions and 6 deletions

View File

@ -45,7 +45,7 @@ commands:
jobs:
prep_env:
docker:
- image: tlaurion/heads-dev-env:v0.0.9
- image: tlaurion/heads-dev-env:v0.1.1
resource_class: large
working_directory: ~/heads
steps:
@ -111,7 +111,7 @@ jobs:
build_and_persist:
docker:
- image: tlaurion/heads-dev-env:v0.0.9
- image: tlaurion/heads-dev-env:v0.1.1
resource_class: large
working_directory: ~/heads
parameters:
@ -139,7 +139,7 @@ jobs:
build:
docker:
- image: tlaurion/heads-dev-env:v0.0.9
- image: tlaurion/heads-dev-env:v0.1.1
resource_class: large
working_directory: ~/heads
parameters:
@ -160,7 +160,7 @@ jobs:
save_cache:
docker:
- image: tlaurion/heads-dev-env:v0.0.9
- image: tlaurion/heads-dev-env:v0.1.1
resource_class: large
working_directory: ~/heads
steps:

View File

@ -61,6 +61,9 @@ docker push tlaurion/heads-dev-env:v0.0.3
#To create the docker image, using garbage collector didn't help and made the size of the image grow bigger?! not using it reverting to what worked
# produced image without garbage collector was 990 Mb image, with it (and stripping which is already done by nix builder...) its 1006Mb. Over my head
# TODO:
# - revisit later, should not block merge of pr
# - do doc under heads's README.md and then heads-wiki
sh <(curl -L https://nixos.org/nix/install) --no-daemon
. /home/user/.nix-profile/etc/profile.d/nix.sh
@ -73,6 +76,10 @@ docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd
#push it
docker login
docker tag linuxboot/heads:dev-env tlaurion/heads-dev-env:v0.1.2
docker push tlaurion/heads-dev-env:v0.1.2
docker tag linuxboot/heads:dev-env tlaurion/heads-dev-env:v0.1.1
docker push tlaurion/heads-dev-env:v0.1.1
# For end-users, CircleCI
docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) laurion/heads-dev-env:v0.1.1 -- make BOARD=qemu-coreboot-whiptail-tpm2
docker run -e DISPLAY=$DISPLAY --network host --rm -ti -v $(pwd):$(pwd) -w $(pwd) laurion/heads-dev-env:v0.1.1 -- make BOARD=qemu-coreboot-whiptail-tpm2 run