[AETHER-255] Collection of missing cherry-picks and other fixes
Includes following commits
- ca05e1fd9d95f6e8801279c19fbf3377b200474c
- 0033dcb99e5bd8e8e7203a349a8dfb9cc4190bc9
- bdf39a75600df007e08234f89b8f8834e00f1b2a
Additionally:
- Removes zte and onos-topo bundles which are not present in 2.2.
- Removes general provider from minimal and seba
Change-Id: Ic078482d1ff465c5b301adee98f0ad98a08c0fdb
diff --git a/Dockerfile b/Dockerfile
index 3e9b928..64bd479 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
ARG JDK_VER=11
ARG BAZEL_VER=1.0.0
ARG JOBS=2
+ARG PROFILE=default
# First stage is the build environment.
# zulu-openjdk images are based on Ubuntu.
@@ -38,12 +39,14 @@
# version.
ARG JOBS
ARG JDK_VER
+ARG PROFILE
RUN bazel build onos \
--jobs ${JOBS} \
--verbose_failures \
--javabase=@bazel_tools//tools/jdk:absolute_javabase \
--host_javabase=@bazel_tools//tools/jdk:absolute_javabase \
- --define=ABSOLUTE_JAVABASE=/usr/lib/jvm/zulu-${JDK_VER}-amd64
+ --define=ABSOLUTE_JAVABASE=/usr/lib/jvm/zulu-${JDK_VER}-amd64 \
+ --define profile=${PROFILE}
# We extract the tar in the build environment to avoid having to put the tar in
# the runtime stage. This saves a lot of space.