docker build version fixups (#241)

fixups to allow non-buildkit docker build to work

Author: bpkroth

docker/benchbase/build-dev-image.sh

@@ -7,11 +7,14 @@ cd "$scriptdir"
 . ./common-env.sh
 
 set -x
-# See comments in devcontainer/Dockerfile explaining /dev/null build context.
-docker build --progress=plain \
-    --build-arg="http_proxy=${http_proxy:-}" --build-arg="https_proxy=${https_proxy:-}" \
+# See comments in devcontainer/Dockerfile explaining empty build context (/dev/null or empty tmpdir).
+tmpdir=$(mktemp -d)
+docker build $docker_build_args \
+    --build-arg BUILDKIT_INLINE_CACHE=1 \
+    --build-arg="http_proxy=${http_proxy:-}" --build-arg="https_proxy=${https_proxy:-}" --build-arg="no_proxy=${no_proxy:-}" \
     --build-arg MAVEN_OPTS="-Dhttp.proxyHost=${http_proxy_host} -Dhttp.proxyPort=${http_proxy_port} -Dhttps.proxyHost=${https_proxy_host} -Dhttps.proxyPort=${https_proxy_port}" \
     --build-arg BENCHBASE_PROFILES="${BENCHBASE_PROFILES}" \
     --build-arg CONTAINERUSER_UID="$CONTAINERUSER_UID" --build-arg CONTAINERUSER_GID="$CONTAINERUSER_GID" \
-    --tag benchbase-dev:latest ${image_tag_args:-} -f ./devcontainer/Dockerfile /dev/null
+    --tag benchbase-dev:latest ${image_tag_args:-} -f ./devcontainer/Dockerfile "$tmpdir"
+rmdir "$tmpdir"
 set +x

docker/benchbase/build-full-image.sh

@@ -11,7 +11,7 @@ cd "$scriptdir"
 
 if [ "$CLEAN_BUILD" == 'true' ]; then
     grep '^FROM ' fullimage/Dockerfile \
-        | sed -r -e 's/^FROM\s+//' -e 's/\s+AS \S+\s*$/ /' \
+        | sed -r -e 's/^FROM\s+//' -e 's/--platform=\S+\s+//' -e 's/\s+AS \S+\s*$/ /' \
         | while read base_image; do
             set -x
             docker pull $base_image &
@@ -79,8 +79,9 @@ function create_image() {
     local target_image_tag_args=$(echo "-t benchbase:latest ${image_tag_args:-}" | sed "s/benchbase:/$image_name:/g")
 
     set -x
-    docker build --progress=plain \
-        --build-arg="http_proxy=${http_proxy:-}" --build-arg="https_proxy=${https_proxy:-}" \
+    docker build $docker_build_args \
+        --build-arg BUILDKIT_INLINE_CACHE=1 \
+        --build-arg="http_proxy=${http_proxy:-}" --build-arg="https_proxy=${https_proxy:-}" --build-arg="no_proxy=${no_proxy:-}" \
         --build-arg CONTAINERUSER_UID="$CONTAINERUSER_UID" --build-arg CONTAINERUSER_GID="$CONTAINERUSER_GID" \
         $target_image_tag_args -f "$scriptdir/fullimage/Dockerfile" "$scriptdir/fullimage/tmp/"
     set +x

docker/benchbase/common-env.sh

@@ -69,3 +69,17 @@ if [ -n "$git_vers_tag" ]; then
         image_tag_args+=" -t $CONTAINER_REGISTRY_NAME/$imagename:$git_vers_tag"
     fi
 fi
+
+docker_build_args=''
+if ! docker buildx version >/dev/null 2>&1; then
+    echo 'NOTE: docker buildkit is unavailable.' >&2
+    DOCKER_BUILDKIT=0
+    docker_build_args=''
+elif [ -z "$DOCKER_BUILDKIT" ]; then
+    # If not already set, default to buildkit.
+    DOCKER_BUILDKIT=1
+fi
+if [ "$DOCKER_BUILDKIT" == 1 ]; then
+    docker_build_args='--progress=plain'
+fi
+export DOCKER_BUILDKIT

docker/benchbase/devcontainer/Dockerfile

@@ -1,5 +1,6 @@
 # For the devcontainer we need a full JDK.
-FROM --platform=linux maven:3.8.5-eclipse-temurin-17 AS devcontainer
+#FROM --platform=linux maven:3.8.5-eclipse-temurin-17 AS devcontainer
+FROM maven:3.8.5-eclipse-temurin-17 AS devcontainer
 
 LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
 

docker/benchbase/fullimage/Dockerfile

@@ -1,5 +1,6 @@
 # Use a smaller base image that only has the jre, not the full jdk.
-FROM --platform=linux eclipse-temurin:17-jre AS fullimage
+#FROM --platform=linux eclipse-temurin:17-jre AS fullimage
+FROM eclipse-temurin:17-jre AS fullimage
 
 LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
 

docker/benchbase/run-dev-image.sh

@@ -9,7 +9,7 @@ rootdir=$(readlink -f "$scriptdir/../../")
 
 cd "$scriptdir"
 . ./common-env.sh
-./build-dev-image.sh
+./build-dev-image.sh >&2
 
 if [ "$imagename" != 'benchbase-dev' ]; then
     echo "ERROR: Unexpected imagename: $imagename" >&2
@@ -30,7 +30,7 @@ MAVEN_CONFIG="${MAVEN_CONFIG:-$HOME/.m2}"
 mkdir -p "$MAVEN_CONFIG"
 set -x
 docker run ${INTERACTIVE_ARGS:-} --rm \
-    --env=http_proxy="${http_proxy:-}" --env=https_proxy="${https_proxy:-}" \
+    --env=http_proxy="${http_proxy:-}" --env=https_proxy="${https_proxy:-}" --env=no_proxy="${no_proxy:-}" \
     --env MAVEN_OPTS="-Dhttp.proxyHost=${http_proxy_host} -Dhttp.proxyPort=${http_proxy_port} -Dhttps.proxyHost=${https_proxy_host} -Dhttps.proxyPort=${https_proxy_port}" \
     --env BENCHBASE_PROFILES="$BENCHBASE_PROFILES" \
     --env CLEAN_BUILD="$CLEAN_BUILD" \