COMAC-168 Add static IPAM plugin
Also, use --label instead of passing labels as arguments
Change-Id: I85d66ddbb140f2003fe563b68b2df4ef2009f975
diff --git a/Dockerfile b/Dockerfile
index 0a95502..a2a3cbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,6 +45,12 @@
RUN wget -O /bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
RUN chmod +x /bin/vfioveth /bin/jq
+# Copy static IPAM plugin
+FROM busybox as static
+RUN wget https://github.com/containernetworking/plugins/releases/download/v0.8.2/cni-plugins-linux-amd64-v0.8.2.tgz
+RUN tar xvfz cni-plugins-linux-amd64-v0.8.2.tgz
+RUN cp ./static /bin/static
+
# Final image
FROM centos/systemd as omec-cni
WORKDIR /tmp/cni/bin
@@ -53,19 +59,6 @@
COPY --from=centralip-ipam /go/src/github.com/John-Lin/ovs-cni/bin/centralip .
COPY --from=vfioveth /bin/vfioveth .
COPY --from=vfioveth /bin/jq .
+COPY --from=static /bin/static .
WORKDIR /usr/bin
COPY --from=sriov-dp /go/src/github.com/intel/sriov-network-device-plugin/build/sriovdp .
-
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-
-LABEL org.label-schema.schema-version=1.0 \
- org.label-schema.name=omec-cni \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
diff --git a/Makefile b/Makefile
index 586a612..c105773 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,13 @@
docker build $(DOCKER_BUILD_ARGS) \
--target ${DOCKER_BUILD_TARGET} \
--tag ${DOCKER_IMAGENAME} \
- --build-arg org_label_schema_version="${VERSION}" \
- --build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \
- --build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
- --build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
- --build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
+ --label "org.label-schema.schema-version=1.0" \
+ --label "org.label-schema.name=${DOCKER_BUILD_TARGET}" \
+ --label "org.label-schema.version=${VERSION}" \
+ --label "org.label-schema.vcs-url=${DOCKER_LABEL_VCS_URL}" \
+ --label "org.label-schema.vcs-ref=${DOCKER_LABEL_VCS_REF}" \
+ --label "org.label-schema.build-date=${DOCKER_LABEL_BUILD_DATE}" \
+ --label "org.opencord.vcs-commit-date=${DOCKER_LABEL_COMMIT_DATE}" \
.
docker-push: