summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
Diffstat (limited to 'ocata')
-rw-r--r--ocata/docker/build_image.sh4
-rw-r--r--ocata/ocata/settings.py5
-rw-r--r--ocata/pom.xml6
3 files changed, 14 insertions, 1 deletions
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index b0d72264..e8bfdf2c 100644
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -7,6 +7,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
VERSION="1.0.0-SNAPSHOT"
+STAGING="1.0.0-STAGING"
PROJECT="multicloud"
IMAGE="openstack-ocata"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -20,12 +21,13 @@ if [ $HTTPS_PROXY ]; then
fi
function build_image {
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .
}
function push_image {
docker push ${IMAGE_NAME}:${VERSION}
docker push ${IMAGE_NAME}:latest
+ docker push ${IMAGE_NAME}:${STAGING}
}
build_image
diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 1e8473b7..3cc4caa9 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -99,6 +99,11 @@ LOGGING = {
'level': 'DEBUG',
'propagate': False
},
+ 'newton': {
+ 'handlers': ['ocata_handler'],
+ 'level': 'DEBUG',
+ 'propagate': False
+ },
}
}
diff --git a/ocata/pom.xml b/ocata/pom.xml
index bd703378..58179fd9 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -33,6 +33,12 @@
<type>zip</type>
</dependency>
</dependencies>
+ <properties>
+ <encoding>UTF-8</encoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <nexusproxy>https://nexus.onap.org</nexusproxy>
+ </properties>
<build>
<plugins>
<plugin>