feat(imagebuilder): use official podman

Author: duanhongyi

charts/imagebuilder/templates/imagebuilder-configmap.yaml

@@ -17,11 +17,5 @@ data:
         }
     ]
   registries.conf: |
-    unqualified-search-registries = ["docker.io", "quay.io"]
-    [[registry]]
-    prefix = "docker.io"
-    insecure = true
-    [[registry]]
-    prefix = "localhost:5000"
-    insecure = true
+    {{- .Values.container_registries | nindent 4 }}
   image_pull_policy: {{ .Values.image_pull_policy }}

charts/imagebuilder/values.yaml

@@ -2,3 +2,6 @@ image_org: "drycc"
 image_pull_policy: "Always"
 image_tag: "canary"
 image_registry: "docker.io"
+container_registries: |
+  unqualified-search-registries = ["docker.io"]
+  short-name-mode="permissive"

rootfs/Dockerfile

@@ -1,9 +1,11 @@
 FROM docker.io/minio/mc:latest as mc
+FROM docker.io/drycc/go-dev:latest as go-dev
 
-FROM docker.io/drycc/go-dev
+FROM quay.io/containers/podman:latest
 
 ADD . /
 COPY --from=mc /usr/bin/mc /bin/mc
+COPY --from=go-dev /usr/local/bin/pack /bin/pack
 
 RUN /imagebuilder/install
 

rootfs/imagebuilder/build

@@ -38,6 +38,11 @@ if [[ "${DRYCC_DEBUG}" ]]; then
     unset DRYCC_DEBUG
 fi
 
+registries="/etc/imagebuilder/registries.conf"
+if [ -f "${registries}" ]; then
+    cat "${registries}" > /etc/containers/registries.conf
+fi
+
 podman system service \
     --log-level "${log_level}" \
     --time 0 tcp:0.0.0.0:${DOCKER_PORT} &

rootfs/imagebuilder/install

@@ -1,12 +1,27 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CADDY_DOWNLOAD_URL="https://github.com/caddyserver/caddy/releases/download/v2.4.3/caddy_2.4.3_linux_$(dpkg --print-architecture).tar.gz"
+# initArch discovers the architecture for this system.
+init_arch() {
+  ARCH=$(uname -m)
+  case $ARCH in
+    armv5*) ARCH="armv5";;
+    armv6*) ARCH="armv6";;
+    armv7*) ARCH="arm";;
+    aarch64) ARCH="arm64";;
+    x86) ARCH="386";;
+    x86_64) ARCH="amd64";;
+    i686) ARCH="386";;
+    i386) ARCH="386";;
+  esac
+}
+init_arch
+
+CADDY_DOWNLOAD_URL="https://github.com/caddyserver/caddy/releases/download/v2.4.5/caddy_2.4.5_linux_${ARCH}.tar.gz"
 (curl -sSL "${CADDY_DOWNLOAD_URL}" | tar -C /usr/local/bin/ --no-same-owner -xzv caddy)
 
-apt-get autoremove -y --purge
-apt-get clean all
+dnf install -yq procps-ng psmisc
+
+dnf clean all
 rm -rf /root/*
-rm -rf /tmp/*
-rm -rf /var/cache/apt/archives/*.deb
-rm -rf /var/lib/apt/lists/*
+rm -rf /tmp/*