Include all toolbox base image

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Jun 4, 2024 · 3005a75 · 3005a75
1 parent 730fc4a
commit 3005a75
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5 b/.obs/dockerfile/Dockerfile.sle-micro-5-5
@@ -4,16 +4,12 @@
 
 ARG SLMICRO_VERSION
 
-FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest
 
 ARG CHANNEL_JSON_FILE="sle-micro-5-5.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
-FROM scratch
-COPY --from=builder /usr/bin/cp /usr/bin/cp
-COPY --from=builder /channel.json /channel.json
-
 USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers

diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm b/.obs/dockerfile/Dockerfile.sle-micro-5-5-kvm
@@ -4,16 +4,12 @@
 
 ARG SLMICRO_VERSION
 
-FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest
 
 ARG CHANNEL_JSON_FILE="sle-micro-5-5-kvm.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
-FROM scratch
-COPY --from=builder /usr/bin/cp /usr/bin/cp
-COPY --from=builder /channel.json /channel.json
-
 USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers

diff --git a/.obs/dockerfile/Dockerfile.sle-micro-5-5-rt b/.obs/dockerfile/Dockerfile.sle-micro-5-5-rt
@@ -4,16 +4,12 @@
 
 ARG SLMICRO_VERSION
 
-FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest as builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/toolbox:latest
 
 ARG CHANNEL_JSON_FILE="sle-micro-5-5-rt.json"
 
 COPY $CHANNEL_JSON_FILE /channel.json
 
-FROM scratch
-COPY --from=builder /usr/bin/cp /usr/bin/cp
-COPY --from=builder /channel.json /channel.json
-
 USER 10010:10010
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers