github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-26 12:03:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #903 from s1061123/dev/fedora-image

Browse Source 
[WIP]Change container image to python:slim from centos
This commit is contained in:
Doug Smith
2022-08-26 14:35:23 -04:00
committed by GitHub
parent 33c0d1bd86 db7cc6bc80
commit e882d51b3c
7 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/Dockerfile
View File

@@ -7,7 +7,7 @@ ADD . /usr/src/multus-cni
RUN cd /usr/src/multus-cni && \ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
FROM centos:centos7 FROM python:slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

2
images/Dockerfile.arm32
View File

@@ -11,7 +11,7 @@ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
# build arm container # build arm container
FROM arm32v7/centos:7 FROM arm32v7/python:slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

2
images/Dockerfile.arm64
View File

@@ -11,7 +11,7 @@ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
# build arm64 container # build arm64 container
FROM arm64v8/centos:7 FROM arm64v8/python:slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

2
images/Dockerfile.ppc64le
View File

@@ -11,7 +11,7 @@ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
# build ppc container # build ppc container
FROM ppc64le/centos:latest FROM ppc64le/python:slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

2
images/Dockerfile.s390x
View File

@@ -11,7 +11,7 @@ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
# build s390x container # build s390x container
FROM s390x/python:3-slim FROM s390x/python:slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

2
images/Dockerfile.thick
View File

@@ -7,7 +7,7 @@ ADD . /usr/src/multus-cni
RUN cd /usr/src/multus-cni && \ RUN cd /usr/src/multus-cni && \
./hack/build-go.sh ./hack/build-go.sh
FROM registry.access.redhat.com/ubi8/ubi-minimal FROM debian:stable-slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE

10
images/entrypoint.sh
View File

@@ -89,10 +89,6 @@ function warn()
log "WARN: {$1}" log "WARN: {$1}"
} }
if type python3 &> /dev/null; then
alias python=python3
fi
function checkCniVersion { function checkCniVersion {
cniversion_python_tmpfile=$(mktemp) cniversion_python_tmpfile=$(mktemp)
cat << EOF > $cniversion_python_tmpfile cat << EOF > $cniversion_python_tmpfile
@@ -109,7 +105,7 @@ if version(v_top_level) >= v_040 and version(v_nested) < v_040:
msg = "Multus cni version is %s while master plugin cni version is %s" msg = "Multus cni version is %s while master plugin cni version is %s"
print(msg % (v_top_level, v_nested)) print(msg % (v_top_level, v_nested))
EOF EOF
python $cniversion_python_tmpfile $1 $2 python3 $cniversion_python_tmpfile $1 $2
} }
# Parse parameters given as arguments to this script. # Parse parameters given as arguments to this script.
@@ -378,7 +374,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then
if [ "$OVERRIDE_NETWORK_NAME" == "true" ]; then if [ "$OVERRIDE_NETWORK_NAME" == "true" ]; then
MASTER_PLUGIN_NET_NAME="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \ MASTER_PLUGIN_NET_NAME="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \
python -c 'import json,sys;print(json.load(sys.stdin)["name"])')" python3 -c 'import json,sys;print(json.load(sys.stdin)["name"])')"
else else
MASTER_PLUGIN_NET_NAME="multus-cni-network" MASTER_PLUGIN_NET_NAME="multus-cni-network"
fi fi
@@ -400,7 +396,7 @@ else:
EOF EOF
NESTED_CAPABILITIES_STRING="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \ NESTED_CAPABILITIES_STRING="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \
python $capabilities_python_filter_tmpfile)" python3 $capabilities_python_filter_tmpfile)"
rm $capabilities_python_filter_tmpfile rm $capabilities_python_filter_tmpfile
log "Nested capabilities string: $NESTED_CAPABILITIES_STRING" log "Nested capabilities string: $NESTED_CAPABILITIES_STRING"