Using specific OVS base image (2.13.1-0.9.3)

In order to include strongSwan configuration patch.
antoninbas · Sep 3, 2020 · ba461b5 · ba461b5
1 parent ea33d94
commit ba461b5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/build/images/Dockerfile.build.ubuntu b/build/images/Dockerfile.build.ubuntu
@@ -11,7 +11,7 @@ COPY . /antrea
 RUN make antrea-agent antrea-controller antrea-cni antctl-ubuntu
 
 
-FROM antrea/base-ubuntu:2.13.1
+FROM antrea/base-ubuntu:2.13.1-0.9.3
 
 LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
 LABEL description="The Docker image to deploy the Antrea CNI. "

diff --git a/build/images/Dockerfile.ubuntu b/build/images/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM antrea/base-ubuntu:2.13.1
+FROM antrea/base-ubuntu:2.13.1-0.9.3
 
 LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
 LABEL description="The Docker image to deploy the Antrea CNI. "

diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG OVS_VERSION=2.13.1
+ARG IMG_TAG=2.13.1
 FROM ubuntu:20.04 as cni-binaries
 
 RUN apt-get update && \
@@ -11,7 +11,7 @@ RUN mkdir -p /opt/cni/bin && \
     wget -q -O - https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS
 
 
-FROM antrea/openvswitch:${OVS_VERSION}
+FROM antrea/openvswitch:${IMG_TAG}
 
 LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
 LABEL description="Takes care of building the Antrea binaries as part of building the image."

diff --git a/build/images/base/build_and_push.sh b/build/images/base/build_and_push.sh
@@ -23,8 +23,8 @@ function echoerr {
     >&2 echo "$@"
 }
 
-if [ -z "$OVS_VERSION" ]; then
-    echoerr "The OVS_VERSION env variable must be set to a valid value (e.g. 2.13.1)"
+if [ -z "$IMG_TAG" ]; then
+    echoerr "The IMG_TAG env variable must be set to a valid value (e.g. 2.13.1)"
     exit 1
 fi
 
@@ -34,13 +34,13 @@ pushd $THIS_DIR > /dev/null
 
 docker pull ubuntu:20.04
 
-docker pull antrea/openvswitch:$OVS_VERSION
+docker pull antrea/openvswitch:$IMG_TAG
 
 docker build \
-       -t antrea/base-ubuntu:$OVS_VERSION \
+       -t antrea/base-ubuntu:$IMG_TAG \
        -f Dockerfile \
-       --build-arg OVS_VERSION=$OVS_VERSION .
+       --build-arg IMG_TAG=$IMG_TAG .
 
-docker push antrea/base-ubuntu:$OVS_VERSION
+docker push antrea/base-ubuntu:$IMG_TAG
 
 popd > /dev/null
diff --git a/build/images/ovs/build_and_push.sh b/build/images/ovs/build_and_push.sh
@@ -28,6 +28,10 @@ if [ -z "$OVS_VERSION" ]; then
     exit 1
 fi
 
+if [ -z "$IMG_TAG" ]; then
+    IMG_TAG="$OVS_VERSION"
+fi
+
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 pushd $THIS_DIR > /dev/null
@@ -42,17 +46,17 @@ pushd $THIS_DIR > /dev/null
 docker pull ubuntu:20.04
 
 docker build --target ovs-debs \
-       --cache-from antrea/openvswitch-debs:$OVS_VERSION \
-       -t antrea/openvswitch-debs:$OVS_VERSION \
+       --cache-from antrea/openvswitch-debs:$IMG_TAG \
+       -t antrea/openvswitch-debs:$IMG_TAG \
        --build-arg OVS_VERSION=$OVS_VERSION .
 
 docker build \
-       --cache-from antrea/openvswitch-debs:$OVS_VERSION \
-       --cache-from antrea/openvswitch:$OVS_VERSION \
-       -t antrea/openvswitch:$OVS_VERSION \
+       --cache-from antrea/openvswitch-debs:$IMG_TAG \
+       --cache-from antrea/openvswitch:$IMG_TAG \
+       -t antrea/openvswitch:$IMG_TAG \
        --build-arg OVS_VERSION=$OVS_VERSION .
 
-docker push antrea/openvswitch-debs:$OVS_VERSION
-docker push antrea/openvswitch:$OVS_VERSION
+docker push antrea/openvswitch-debs:$IMG_TAG
+docker push antrea/openvswitch:$IMG_TAG
 
 popd > /dev/null
diff --git a/build/images/test/Dockerfile b/build/images/test/Dockerfile
@@ -1,4 +1,4 @@
-FROM antrea/openvswitch:2.13.1
+FROM antrea/openvswitch:2.13.1-0.9.3
 
 LABEL maintainer="Antrea <projectantrea-dev@googlegroups.com>"
 LABEL description="A Docker image for antrea integration tests."