[VOL-2602] Moving 2.2 to the latest apps
Change-Id: Ia03248a1fb33270ae1b5a2ff09d598d1ccb6a5dc
diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 9c7c186..b9b9fde 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,11 +34,11 @@
# Unpack and install specific apps from download stage
-FROM onosproject/onos:1.13.9 as install
+FROM onosproject/onos:2.2-latest@sha256:816d98aba07771e877cfd895d05d86f06a00fc2cc37c936ecb565f1ca286b4e6 as install
# The ENV settings must be replicated below as they are not shared between stages
ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.8
+ENV KARAF_VERSION=4.2.8
ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
ENV APPS_ROOT=${ONOS}/apps
ENV KARAF_M2=${KARAF_ROOT}/system
@@ -48,6 +48,9 @@
# Copy the downloaded artifact to the install stage container
COPY --from=download ${DOWNLOAD_ROOT} ${DOWNLOAD_ROOT}
+RUN apt-get update
+RUN apt-get install unzip -y
+
# Install the applications
COPY app-install.sh ./app-install.sh
RUN chmod 755 ./app-install.sh
@@ -55,11 +58,11 @@
# Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:1.13.9
+FROM onosproject/onos:2.2-latest@sha256:816d98aba07771e877cfd895d05d86f06a00fc2cc37c936ecb565f1ca286b4e6
# The ENV settings must be replicated below as they are not shared between stages
ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.8
+ENV KARAF_VERSION=4.2.8
ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
ENV KARAF_M2=${KARAF_ROOT}/system
ENV APPS_ROOT=${ONOS}/apps
diff --git a/VERSION b/VERSION
index 97102b4..fcdb2e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.2-dev
+4.0.0
diff --git a/dependencies.xml b/dependencies.xml
index 7d6ec3d..61a3cea 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,11 +24,11 @@
<version>fake</version>
<properties>
- <olt.version>3.0.1</olt.version>
- <sadis.version>3.1.0</sadis.version>
- <aaa.version>1.10.0</aaa.version>
- <dhcpl2relay.version>1.6.2</dhcpl2relay.version>
- <kafka.version>1.2.0</kafka.version>
+ <olt.version>4.0.1</olt.version>
+ <sadis.version>5.0.0</sadis.version>
+ <aaa.version>2.0.1</aaa.version>
+ <dhcpl2relay.version>2.0.1</dhcpl2relay.version>
+ <kafka.version>2.1.1</kafka.version>
</properties>
<build>