From 208a682ebe652c0c7a212ec9f7f67cdeb0014720 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Tue, 9 Jan 2024 09:54:02 +0100 Subject: [PATCH 1/3] GitHub Codespaces is now OK with Docker build kit --- README.md | 3 --- docker/build/sciencemesh.sh | 3 --- docker/build/solid.sh | 3 --- docker/build/sunet.sh | 3 --- docker/build/surf-rd-sram.sh | 3 --- docker/build/surf-token-based-access.sh | 3 --- docker/build/surf-trashbin.sh | 3 --- 7 files changed, 21 deletions(-) diff --git a/README.md b/README.md index 08fab039..02a1c09a 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,6 @@ Docker images we use in development. -# Note -If you do build on Codespaces, make sure you set `DOCKER_BUILDKIT=0` . - # EFSS versions ## Nextcloud version diff --git a/docker/build/sciencemesh.sh b/docker/build/sciencemesh.sh index 0c993f0d..bfa6dbc3 100755 --- a/docker/build/sciencemesh.sh +++ b/docker/build/sciencemesh.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/solid.sh b/docker/build/solid.sh index e329950c..40e7d432 100755 --- a/docker/build/solid.sh +++ b/docker/build/solid.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/sunet.sh b/docker/build/sunet.sh index ad6508c7..a66280e7 100755 --- a/docker/build/sunet.sh +++ b/docker/build/sunet.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-rd-sram.sh b/docker/build/surf-rd-sram.sh index 0335d530..2d94e3ed 100755 --- a/docker/build/surf-rd-sram.sh +++ b/docker/build/surf-rd-sram.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-token-based-access.sh b/docker/build/surf-token-based-access.sh index 74b9214e..34e5932e 100755 --- a/docker/build/surf-token-based-access.sh +++ b/docker/build/surf-token-based-access.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-trashbin.sh b/docker/build/surf-trashbin.sh index 5e564c74..a3650fea 100755 --- a/docker/build/surf-trashbin.sh +++ b/docker/build/surf-trashbin.sh @@ -5,9 +5,6 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 - # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink From 812f329e63a9e73bc17a27f9f80d9975c729d2da Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Tue, 9 Jan 2024 17:50:11 +0000 Subject: [PATCH 2/3] add: silent useless stdout from docker --- docker/delete-all-images.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/delete-all-images.sh b/docker/delete-all-images.sh index 31bbecec..086f075a 100755 --- a/docker/delete-all-images.sh +++ b/docker/delete-all-images.sh @@ -6,10 +6,10 @@ set -e # delete all containers including its volumes. -docker rm -vf $(docker ps -aq) || true +docker rm -vf $(docker ps -aq) >/dev/null 2>&1 || true # delete all images. -docker rmi -f $(docker images -aq) || true +docker rmi -f $(docker images -aq) >/dev/null 2>&1 || true docker system prune --force docker volume prune --force From 46e32405aba5b62bc864b614338f3ab1fc9ee143 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Tue, 9 Jan 2024 18:13:47 +0000 Subject: [PATCH 3/3] add: command argument for enable/disable docker buildkit --- docker/build/all.sh | 6 ++++-- docker/build/sciencemesh.sh | 5 +++++ docker/build/solid.sh | 5 +++++ docker/build/sunet.sh | 5 +++++ docker/build/surf-rd-sram.sh | 5 +++++ docker/build/surf-token-based-access.sh | 5 +++++ docker/build/surf-trashbin.sh | 5 +++++ 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docker/build/all.sh b/docker/build/all.sh index 26509968..366fb472 100755 --- a/docker/build/all.sh +++ b/docker/build/all.sh @@ -5,8 +5,10 @@ set -e -# @michielbdejong avoid docker buildkit -export DOCKER_BUILDKIT=0 +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" # find this scripts location. SOURCE=${BASH_SOURCE[0]} diff --git a/docker/build/sciencemesh.sh b/docker/build/sciencemesh.sh index bfa6dbc3..aee13b88 100755 --- a/docker/build/sciencemesh.sh +++ b/docker/build/sciencemesh.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/solid.sh b/docker/build/solid.sh index 40e7d432..512568a1 100755 --- a/docker/build/solid.sh +++ b/docker/build/solid.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/sunet.sh b/docker/build/sunet.sh index a66280e7..b72a8a66 100755 --- a/docker/build/sunet.sh +++ b/docker/build/sunet.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-rd-sram.sh b/docker/build/surf-rd-sram.sh index 2d94e3ed..71cf3365 100755 --- a/docker/build/surf-rd-sram.sh +++ b/docker/build/surf-rd-sram.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-token-based-access.sh b/docker/build/surf-token-based-access.sh index 34e5932e..d8510cc5 100755 --- a/docker/build/surf-token-based-access.sh +++ b/docker/build/surf-token-based-access.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink diff --git a/docker/build/surf-trashbin.sh b/docker/build/surf-trashbin.sh index a3650fea..53c7cae8 100755 --- a/docker/build/surf-trashbin.sh +++ b/docker/build/surf-trashbin.sh @@ -5,6 +5,11 @@ set -e +# use docker buildkit. you can disable buildkit by providing 0 as first argument. +USE_BUILDKIT=${1:-"1"} + +export DOCKER_BUILDKIT="${USE_BUILDKIT}" + # find this scripts location. SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink