diff options
Diffstat (limited to 'sdc-os-chef')
| -rw-r--r-- | sdc-os-chef/pom.xml | 2 | ||||
| -rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 24 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-backend/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-cassandra/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-elasticsearch/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-frontend/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-kibana/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-sanity/Dockerfile | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 1630b31227..f0bf6ec9ff 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -303,7 +303,7 @@ <configuration> <verbose>true</verbose> <apiVersion>1.23</apiVersion> - <registry>nexus3.onap.org:10003</registry> + <registry>nexus3.onap.org:10001</registry> <authConfig> <pull> <username>docker</username> diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 08be852676..b147c812aa 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -64,27 +64,27 @@ DEBUG_PORT="--publish 4000:4000" [ -f /opt/config/nexus_password.txt ] && NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) || NEXUS_PASSWD=sfWU3DFVdBr7GVxB85mTYgAW [ -f /opt/config/nexus_docker_repo.txt ] && NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) || NEXUS_DOCKER_REPO=ecomp-nexus:${PORT} -while [ "$1" != "" ]; do +while test $# -gt 0; do case $1 in -r | --release ) shift - RELEASE=${1} + RELEASE=$1 ;; -e | --environment ) shift - DEP_ENV=${1} + DEP_ENV=$1 ;; -p | --port ) shift - PORT=${1} + PORT=$1 ;; - -l | --local ) - shift - LOCAL=true - ;; - -s | --skipTests ) - shift - SKIPTESTS=true + -l | --local ) + shift + LOCAL=true + ;; + -s | --skipTests ) + shift + SKIPTESTS=true ;; -h | --help ) usage @@ -94,9 +94,9 @@ while [ "$1" != "" ]; do usage exit 1 esac - shift done + [ -f /opt/config/nexus_username.txt ] && docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index e28a85d51e..ecd245a533 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-backend:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-backend:v1.0.0 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index 6066aeb453..27cbc92214 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-cassandra:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-cassandra:v1.0.0 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile index 60db8e5b6b..4f1463dd82 100644 --- a/sdc-os-chef/sdc-elasticsearch/Dockerfile +++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-elasticsearch:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-elasticsearch:v1.0.0 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile index 5039b08034..2940a43286 100644 --- a/sdc-os-chef/sdc-frontend/Dockerfile +++ b/sdc-os-chef/sdc-frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-frontend:v1.0.0 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile index 6a058def0e..ccaa350ca4 100644 --- a/sdc-os-chef/sdc-kibana/Dockerfile +++ b/sdc-os-chef/sdc-kibana/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-kibana:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-kibana:v1.0.0 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile index 38bf26641e..1dd064a585 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile @@ -1,4 +1,4 @@ -FROM openecomp/base_sdc-sanity:1.0.0-SNAPSHOT-latest +FROM openecomp/base_sdc-sanity:v1.0.0 COPY chef-solo /root/chef-solo/ |