Merge pull request #69 from pondersource/use-buildkit

GitHub Codespaces is now OK with Docker build kit

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
 

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]}

docker/build/sciencemesh.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]}

docker/build/solid.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]}

docker/build/sunet.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]}

docker/build/surf-rd-sram.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]}

docker/build/surf-token-based-access.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]}

docker/build/surf-trashbin.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]}

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