Cleanup

.github/workflows/test-docker.yml

@@ -20,6 +20,8 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+    paths:
+      - 'share/docker/*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

build.sh

@@ -351,9 +351,11 @@ do
       ;;
 
     docker-test)
-      export DOCKER_DEFAULT_PLATFORM="$(docker info --format "{{.OSType}}/{{.Architecture}}")"
+      if [ -z "$BUILDPLATFORM" ]; then
+        export BUILDPLATFORM=$(docker info --format "{{.OSType}}/{{.Architecture}}")
+      fi
       tar -cf- share/docker/Dockerfile $DOCKER_EXTRA_CONTEXT |
-        DOCKER_BUILDKIT=1 docker build -t avro-test --build-arg BUILDPLATFORM="${DOCKER_DEFAULT_PLATFORM}" -f share/docker/Dockerfile -
+        DOCKER_BUILDKIT=1 docker build -t avro-test --build-arg BUILDPLATFORM="${BUILDPLATFORM}" -f share/docker/Dockerfile -
       docker run --rm \
         --volume "${PWD}:/avro${DOCKER_MOUNT_FLAG}" \
         --volume "${PWD}/share/docker/m2/:/root/.m2/" \

share/docker/Dockerfile

@@ -95,20 +95,13 @@ RUN apt-get -qqy install --no-install-recommends libzstd-dev \
                                                  php-dev
 
 # Required for Dotnet
-#RUN ARCH="$(dpkg --print-architecture)"
-#ENV LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2_$ARCH.deb"
-#RUN if [ "$ARCH" == "amd64" ] || [ "$ARCH" == "i386" ]; then \
-#      LIBSSL_URL="https://security.ubuntu.com/ubuntu/pool/main/o/openssl/$LIBSSL_DEB" \
-#  else \
-#      LIBSSL_URL="https://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/$LIBSSL_DEB" \
-#  fi \
-#  wget "$LIBSSL_URL" \
-#  dpkg -i "$LIBSSL_DEB" \
-#  rm -f "$LIBSSL_DEB"
-RUN wget -q https://www.openssl.org/source/openssl-1.1.1q.tar.gz && \
-    tar -xzf openssl-1.1.1q.tar.gz && \
-    cd openssl-1.1.1q && \
-    ./config && make install
+RUN export ARCH="$(dpkg --print-architecture)"; \
+  export LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2.22_$ARCH.deb"; \
+  if [ "$ARCH" == "amd64" ] || [ "$ARCH" == "i386" ]; then LIBSSL_URL="http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$LIBSSL_DEB"; else LIBSSL_URL="http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/$LIBSSL_DEB"; fi; \
+  echo $LIBSSL_URL; \
+  wget "$LIBSSL_URL"; \
+  dpkg -i "$LIBSSL_DEB"; \
+  rm "$LIBSSL_DEB"
 
 # Install a maven release  -------------------------------------------
 # Inspired from https://github.com/apache/accumulo-docker/blob/bbb9892e165d40fb35fa19f38929effc5d0c709b/Dockerfile#L30
@@ -143,7 +136,7 @@ ENV PATH="/opt/maven/bin:${PATH}"
 # The node deprecation warnings cause a 20 second sleep.
 # But mom, I'm not even tired!
 RUN curl -sSL https://deb.nodesource.com/setup_14.x \
-  | sed 's/sleep 20/echo "But mom!"/' \
+  | sed 's/sleep/echo "But mom!"/' \
   | bash \
  && apt-get -qqy install nodejs \
  && apt-get -qqy clean \