Update builder container

bounverif · Feb 5, 2025 · 8e25fa9 · 8e25fa9
1 parent 986f899
commit 8e25fa9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/containers/Makefile b/containers/Makefile
@@ -26,11 +26,12 @@ asam-osi:
 	buildah build \
 		-f esmini-asam-osi/Dockerfile \
 		--build-arg ESMINI_BUILD_ASAM_OSI_VERSION=${ESMINI_BUILD_ASAM_OSI_VERSION} \
+		--build-arg ESMINI_BUILD_PROTOBUF_VERSION=${ESMINI_BUILD_PROTOBUF_VERSION} \
 		--format oci \
 		--layers=true \
 		--target esmini-asam-osi \
-		--tag ${ESMINI_IMAGE_NAME}:${ESMINI_BUILD_ASAM_OSI_VERSION}-asam-osi \
-		--tag ${ESMINI_IMAGE_NAME}:latest-asam-osi \
+		--tag ${ESMINI_IMAGE_NAME}:${ESMINI_BUILD_ASAM_OSI_VERSION}-${ESMINI_BUILD_PROTOBUF_VERSION}-asam-osi \
+		--tag ${ESMINI_IMAGE_NAME}:latest-${ESMINI_BUILD_PROTOBUF_VERSION}-asam-osi \
 	${CONTAINER_BUILD_CONTEXT}/esmini-asam-osi
 
 builder: 

diff --git a/containers/esmini-builder/Dockerfile b/containers/esmini-builder/Dockerfile
@@ -4,11 +4,12 @@ ARG ESMINI_IMAGE_NAME=localhost/esmini
 ARG ESMINI_REMOTE_IMAGE_NAME=ghcr.io/bounverif/esmini
 ARG ESMINI_VERSION=latest
 
-ARG ESMINI_BUILD_PROTOBUF_VERSION=3.15.2
-ARG ESMINI_BUILD_OSI_VERSION=3.5.0
 ARG ESMINI_BUILD_OSG_VERSION=3.6.5
+ARG ESMINI_BUILD_PROTOBUF_VERSION=3.15.8
+ARG ESMINI_BUILD_ASAM_OSI_VERSION=3.5.0
 
 FROM ${ESMINI_REMOTE_IMAGE_NAME}:${ESMINI_BUILD_OSG_VERSION}-openscenegraph AS esmini-openscenegraph
+FROM ${ESMINI_REMOTE_IMAGE_NAME}:${ESMINI_BUILD_ASAM_OSI_VERSION}-${ESMINI_BUILD_PROTOBUF_VERSION}-asam-osi AS esmini-asam-osi
 
 FROM ${ESMINI_BASE_IMAGE}:${ESMINI_BASE_IMAGE_VERSION} AS esmini-builder
 ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
@@ -25,20 +26,21 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}
       jq \
       gnupg2 \
       ca-certificates \
-      python3-minimal \
-      python3-pip \
-      pipx \
-      python-is-python3 \
       && \
     apt-get autoremove -y && rm -rf /var/lib/apt/lists/* && \
     printf "ubuntu ALL= NOPASSWD: ALL\\n" > /etc/sudoers.d/ubuntu
 
-# Install some python utilities
-RUN python3 -m pip config set global.break-system-packages true && \
-    python3 -m pip install --no-cache-dir \
-      bindep \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}/var/cache/apt \
+    export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update -qq && \
+    apt-get install -qy --no-install-recommends \
+      python3-minimal \
+      python3-pip \
+      python-is-python3 \
       && \
-    PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install semver
+    apt-get autoremove -y && rm -rf /var/lib/apt/lists/* && \
+    python3 -m pip config set global.break-system-packages true && \
+    python3 -m pip install --no-cache-dir bindep
 
 # Install esmini devel packages
 RUN --mount=type=bind,source=dependencies.txt,target=/tmp/esmini/dependencies.txt \
@@ -53,14 +55,10 @@ ENV ESMINI_BUILD_OSG_VERSION=${ESMINI_BUILD_OSG_VERSION}
 COPY --from=esmini-openscenegraph /usr/local /usr/local
 
 ARG ESMINI_BUILD_PROTOBUF_VERSION
+ARG ESMINI_BUILD_ASAM_OSI_VERSION
 ENV ESMINI_BUILD_PROTOBUF_VERSION=${ESMINI_BUILD_PROTOBUF_VERSION}
-COPY --chmod=755 scripts/protobuf-install.sh /usr/local/bin/protobuf-install.sh
-RUN /usr/local/bin/protobuf-install.sh
-
-ARG ESMINI_BUILD_OSI_VERSION
-ENV ESMINI_BUILD_OSI_VERSION=${ESMINI_BUILD_OSI_VERSION}
-COPY --chmod=755 scripts/osi-install.sh /usr/local/bin/osi-install.sh
-RUN /usr/local/bin/osi-install.sh
+ENV ESMINI_BUILD_ASAM_OSI_VERSION=${ESMINI_BUILD_ASAM_OSI_VERSION}
+COPY --from=esmini-asam-osi /usr/local /usr/local
 
 ARG ESMINI_VERSION
 ENV ESMINI_VERSION=${ESMINI_VERSION}