[VOL-3329]Moving to latest 2.2 with karaf 4.2.9
Change-Id: I6daa877bb4f2acc503168d7fcdf007882dbf023f
diff --git a/.gitignore b/.gitignore
index e14594c..ba30a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.log
local_imports
+.idea/
diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 6f38dbb..ef9bdf2 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,11 +34,11 @@
# Unpack and install specific apps from download stage
-FROM onosproject/onos:2.2.3 as install
+FROM onosproject/onos:2.2-latest as install
# The ENV settings must be replicated below as they are not shared between stages
ENV ONOS=/root/onos
-ENV KARAF_VERSION=4.2.8
+ENV KARAF_VERSION=4.2.9
ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
ENV APPS_ROOT=${ONOS}/apps
ENV KARAF_M2=${KARAF_ROOT}/system
@@ -58,11 +58,11 @@
# Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:2.2.3
+FROM onosproject/onos:2.2-latest
# The ENV settings must be replicated below as they are not shared between stages
ENV ONOS=/root/onos
-ENV KARAF_VERSION=4.2.8
+ENV KARAF_VERSION=4.2.9
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 2582ddd..2c2e449 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.1
\ No newline at end of file
+4.1.1-dev