From c5f234ca60840a1de8c9486c51226e6a294c57f3 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Fri, 28 Jun 2019 08:37:18 -0400 Subject: Remove docker scripts These are no longer needed as we are now doing the docker maven plugin due to global-jjb changes. Issue-ID: POLICY-1737 Change-Id: I98e8f2a16a66cfe210ddcdf0c50cb55bdebfd687 Signed-off-by: Pamela Dragosh --- docker_build.sh | 126 ------------------------------------------------------- docker_merge.sh | 114 ------------------------------------------------- docker_verify.sh | 98 ------------------------------------------- 3 files changed, 338 deletions(-) delete mode 100644 docker_build.sh delete mode 100644 docker_merge.sh delete mode 100644 docker_verify.sh diff --git a/docker_build.sh b/docker_build.sh deleted file mode 100644 index 2f11b0ba4..000000000 --- a/docker_build.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# -#============LICENSE_START================================================== -# ONAP Policy Engine -#=========================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. -#=========================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END================================================== -# - -# -echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' -DOCKER_REPOSITORY=nexus3.onap.org:10003 -MVN_VERSION=$(cat packages/docker/target/version) -MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version) -TIMESTAMP=$(date -u +%Y%m%dT%H%M%S) -BUILD_ARGS="--build-arg BUILD_VERSION_ENGINE=${MVN_VERSION}" -IMAGE=policy-pe - -if [ $HTTP_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -fi -if [ $HTTPS_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -echo $DOCKER_REPOSITORY -echo $MVN_VERSION -echo $MVN_MAJMIN_VERSION -echo $TIMESTAMP - -if [[ -z $MVN_VERSION ]] -then - echo "MVN_VERSION is empty" - exit 1 -fi - -if [[ -z $MVN_MAJMIN_VERSION ]] -then - echo "MVN_MAJMIN_VERSION is empty" - exit 1 -fi - -if [[ $MVN_VERSION == *"SNAPSHOT"* ]] -then - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-SNAPSHOT" -else - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-STAGING" -fi - -echo $MVN_MAJMIN_VERSION - -docker login -u docker -p docker nexus3.onap.org:10001 -docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 -docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 - -echo "Building $IMAGE" - -# -# This is the local latest tagged image. The Dockerfile's need this to build images -# -TAGS="--tag onap/${IMAGE}:latest" -# -# This is the nexus repo prepended for latest tagged image. -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:latest" -# -# This has the nexus repo prepended and only major/minor version with latest -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest" -# -# This has the nexus repo prepended and major/minor/patch version with timestamp -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z" - -echo $TAGS - -docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE - -if [ $? -ne 0 ] -then - echo "Docker build failed" - docker images - exit 1 -fi - -docker images - -echo "Pushing $IMAGE" - -docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:latest - -if [ $? -ne 0 ] -then - echo "Docker push failed" - exit 1 - -fi - -docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest - -if [ $? -ne 0 ] -then - echo "Docker push failed" - exit 1 - -fi -docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z - -if [ $? -ne 0 ] -then - echo "Docker push failed" - exit 1 - -fi diff --git a/docker_merge.sh b/docker_merge.sh deleted file mode 100644 index c624662b9..000000000 --- a/docker_merge.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash -# -#============LICENSE_START================================================== -# ONAP Policy Engine -#=========================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. -#=========================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END================================================== -# - -# -echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' -DOCKER_REPOSITORY=nexus3.onap.org:10003 -MVN_VERSION=$(cat packages/docker/target/version) -MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version) -TIMESTAMP=$(date -u +%Y%m%dT%H%M%S) -BUILD_ARGS="--build-arg BUILD_VERSION_ENGINE=${MVN_VERSION}" -IMAGE=policy-pe - -if [ $HTTP_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -fi -if [ $HTTPS_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -echo $DOCKER_REPOSITORY -echo $MVN_VERSION -echo $MVN_MAJMIN_VERSION -echo $TIMESTAMP - -if [[ -z $MVN_VERSION ]] -then - echo "MVN_VERSION is empty" - exit 1 -fi - -if [[ -z $MVN_MAJMIN_VERSION ]] -then - echo "MVN_MAJMIN_VERSION is empty" - exit 1 -fi - -if [[ $MVN_VERSION == *"SNAPSHOT"* ]] -then - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-SNAPSHOT" -else - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-STAGING" -fi - -echo $MVN_MAJMIN_VERSION - -echo "Building $IMAGE" - -docker login -u docker -p docker nexus3.onap.org:10001 -docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 -docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 - -# -# This is the local latest tagged image. The Dockerfile's need this to build images -# -TAGS="--tag onap/${IMAGE}:latest" -# -# This has the nexus repo prepended and only major/minor version with latest -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest" -# -# This has the nexus repo prepended and major/minor/patch version with timestamp -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z" - -echo $TAGS - -docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE - -if [ $? -ne 0 ] -then - echo "Docker build failed" - docker images - exit 1 -fi - -docker images - -# -# Push image -# -echo "Pushing $IMAGE" -docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_MAJMIN_VERSION}-latest - -if [ $? -ne 0 ] -then - echo "Docker push failed" - exit 1 -fi - -docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}Z - -if [ $? -ne 0 ] -then - echo "Docker push failed" - exit 1 -fi diff --git a/docker_verify.sh b/docker_verify.sh deleted file mode 100644 index d97a87f1a..000000000 --- a/docker_verify.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# -#============LICENSE_START================================================== -# ONAP Policy Engine -#=========================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. -#=========================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END================================================== -# - -# -echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES =================' -# -# JUST VERIFY ONLY - NO PUSHING -# -DOCKER_REPOSITORY=nexus3.onap.org:10003 -MVN_VERSION=$(cat packages/docker/target/version) -MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version) -TIMESTAMP=$(date -u +%Y%m%dT%H%M%S) -BUILD_ARGS="--build-arg BUILD_VERSION_ENGINE=${MVN_VERSION}" -IMAGE=policy-pe - -if [ $HTTP_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -fi -if [ $HTTPS_PROXY ]; then - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -echo $DOCKER_REPOSITORY -echo $MVN_VERSION -echo $MVN_MAJMIN_VERSION -echo $TIMESTAMP - -if [[ -z $MVN_VERSION ]] -then - echo "MVN_VERSION is empty" - exit 1 -fi - -if [[ -z $MVN_MAJMIN_VERSION ]] -then - echo "MVN_MAJMIN_VERSION is empty" - exit 1 -fi - -if [[ $MVN_VERSION == *"SNAPSHOT"* ]] -then - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-SNAPSHOT" -else - MVN_MAJMIN_VERSION="${MVN_MAJMIN_VERSION}-STAGING" -fi - -echo $MVN_MAJMIN_VERSION - -echo "Building $IMAGE" - -docker login -u docker -p docker nexus3.onap.org:10001 -docker pull nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 -docker tag nexus3.onap.org:10001/onap/policy-common-alpine:1.4.0 onap/policy-common-alpine:1.4.0 - -# -# This is the local latest tagged image. The Dockerfile's need this to build images -# -TAGS="--tag onap/${IMAGE}:latest" -# -# This has the nexus repo prepended and only major/minor version with latest -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-latest" -# -# This has the nexus repo prepended and major/minor/patch version with timestamp -# -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z" - -echo $TAGS - -docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE - -if [ $? -ne 0 ] -then - echo "Docker build failed" - docker images - exit 1 -fi - -docker images - -- cgit 1.2.3-korg