chore: Clean up docker building (#1877)

Signed-off-by: Igor Šarčević <igor@operately.com>

Author: shiroyasha

Dockerfile

@@ -2,8 +2,6 @@ ARG GO_VERSION=1.25.3
 ARG UBUNTU_VERSION=22.04
 ARG BUILDER_IMAGE="ubuntu:${UBUNTU_VERSION}"
 ARG RUNNER_IMAGE="ubuntu:${UBUNTU_VERSION}"
-ARG APT_MIRROR="http://archive.ubuntu.com/ubuntu"
-ARG APT_SECURITY_MIRROR="http://security.ubuntu.com/ubuntu"
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Base stage with common dependencies.
@@ -15,14 +13,6 @@ FROM ${BUILDER_IMAGE} AS base
 WORKDIR /tmp
 
 COPY scripts/docker scripts
-ARG APT_MIRROR
-ARG APT_SECURITY_MIRROR
-RUN if [ -n "${APT_MIRROR}" ]; then \
-  sed -i "s|http://archive.ubuntu.com/ubuntu|${APT_MIRROR}|g" /etc/apt/sources.list; \
-fi && \
-if [ -n "${APT_SECURITY_MIRROR}" ]; then \
-  sed -i "s|http://security.ubuntu.com/ubuntu|${APT_SECURITY_MIRROR}|g" /etc/apt/sources.list; \
-fi
 
 ENV GO_VERSION=1.25.3
 ENV PATH="/usr/local/go/bin:${PATH}"
@@ -111,15 +101,6 @@ LABEL org.opencontainers.image.title="superplane" \
   org.opencontainers.image.url="https://superplane.com" \
   org.opencontainers.image.documentation="https://docs.superplane.com"
 
-ARG APT_MIRROR
-ARG APT_SECURITY_MIRROR
-RUN if [ -n "${APT_MIRROR}" ]; then \
-  sed -i "s|http://archive.ubuntu.com/ubuntu|${APT_MIRROR}|g" /etc/apt/sources.list; \
-fi && \
-if [ -n "${APT_SECURITY_MIRROR}" ]; then \
-  sed -i "s|http://security.ubuntu.com/ubuntu|${APT_SECURITY_MIRROR}|g" /etc/apt/sources.list; \
-fi
-
 # postgresql-client needs to be installed here too,
 # otherwise the createdb command won't work.
 # Install PostgreSQL 17.5 client tools

release/superplane-demo-image/Dockerfile

@@ -2,8 +2,6 @@ ARG GO_VERSION=1.25.3
 ARG UBUNTU_VERSION=22.04
 ARG BUILDER_IMAGE="ubuntu:${UBUNTU_VERSION}"
 ARG RUNNER_IMAGE="ubuntu:${UBUNTU_VERSION}"
-ARG APT_MIRROR="http://archive.ubuntu.com/ubuntu"
-ARG APT_SECURITY_MIRROR="http://security.ubuntu.com/ubuntu"
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Base stage with build dependencies (mirrors root Dockerfile's base).
@@ -14,14 +12,6 @@ FROM ${BUILDER_IMAGE} AS base
 WORKDIR /tmp
 
 COPY scripts/docker scripts
-ARG APT_MIRROR
-ARG APT_SECURITY_MIRROR
-RUN if [ -n "${APT_MIRROR}" ]; then \
-  sed -i "s|http://archive.ubuntu.com/ubuntu|${APT_MIRROR}|g" /etc/apt/sources.list; \
-fi && \
-if [ -n "${APT_SECURITY_MIRROR}" ]; then \
-  sed -i "s|http://security.ubuntu.com/ubuntu|${APT_SECURITY_MIRROR}|g" /etc/apt/sources.list; \
-fi
 
 ENV GO_VERSION=1.25.3
 ENV PATH="/usr/local/go/bin:${PATH}"
@@ -74,14 +64,6 @@ RUN VITE_BASE_URL=$BASE_URL npm run build
 FROM ${RUNNER_IMAGE} AS demo
 
 ENV DEBIAN_FRONTEND=noninteractive
-ARG APT_MIRROR
-ARG APT_SECURITY_MIRROR
-RUN if [ -n "${APT_MIRROR}" ]; then \
-  sed -i "s|http://archive.ubuntu.com/ubuntu|${APT_MIRROR}|g" /etc/apt/sources.list; \
-fi && \
-if [ -n "${APT_SECURITY_MIRROR}" ]; then \
-  sed -i "s|http://security.ubuntu.com/ubuntu|${APT_SECURITY_MIRROR}|g" /etc/apt/sources.list; \
-fi
 
 LABEL org.opencontainers.image.title="superplane-demo" \
   org.opencontainers.image.description="SuperPlane demo image with embedded PostgreSQL and RabbitMQ for local trials." \

release/superplane-demo-image/build.sh

@@ -15,21 +15,15 @@ fi
 
 VERSION="$1"
 ARCH="$2"
-APT_MIRROR="${APT_MIRROR-}"
-APT_SECURITY_MIRROR="${APT_SECURITY_MIRROR-}"
 
 echo "Building SuperPlane demo image"
 
-BUILD_ARGS=()
-if [ -n "${APT_MIRROR}" ]; then
-  BUILD_ARGS+=(--build-arg "APT_MIRROR=${APT_MIRROR}")
-fi
-if [ -n "${APT_SECURITY_MIRROR}" ]; then
-  BUILD_ARGS+=(--build-arg "APT_SECURITY_MIRROR=${APT_SECURITY_MIRROR}")
-fi
-
-docker build \
+docker buildx build \
+  --platform "linux/${ARCH}" \
+  --progress=plain \
+  --provenance=false \
   --push \
-  -t "ghcr.io/superplanehq/superplane-demo:${VERSION}-${ARCH}" \
   "${BUILD_ARGS[@]}" \
-  -f release/superplane-demo-image/Dockerfile . \
+  -t "ghcr.io/superplanehq/superplane-demo:${VERSION}-${ARCH}" \
+  -f release/superplane-demo-image/Dockerfile \
+  .

release/superplane-image/build.sh

@@ -15,21 +15,14 @@ fi
 
 VERSION="$1"
 ARCH="$2"
-APT_MIRROR="${APT_MIRROR-}"
-APT_SECURITY_MIRROR="${APT_SECURITY_MIRROR-}"
 
 echo "Building SuperPlane image"
 
-BUILD_ARGS=()
-if [ -n "${APT_MIRROR}" ]; then
-  BUILD_ARGS+=(--build-arg "APT_MIRROR=${APT_MIRROR}")
-fi
-if [ -n "${APT_SECURITY_MIRROR}" ]; then
-  BUILD_ARGS+=(--build-arg "APT_SECURITY_MIRROR=${APT_SECURITY_MIRROR}")
-fi
-
-docker build \
+docker buildx build \
+  --platform "linux/${ARCH}" \
+  --progress=plain \
+  --provenance=false \
   --push \
   -t "ghcr.io/superplanehq/superplane:${VERSION}-${ARCH}" \
-  "${BUILD_ARGS[@]}" \
-  -f Dockerfile .
+  -f Dockerfile \
+  .