From 638480e04fc6eadeebdcb018573a463a1c61cdaa Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Thu, 7 Feb 2019 15:58:58 -0600 Subject: basic image with CL app preloaded The image can replace the drools-pdp and only overrides what is necessary to make sure the CL application is in the image. There should be no functional difference. Tooling to operate with docker images is provided as well, for example: controlloop/tools/docker-cl --help BUILD INFO: image: policy-pdpd-cl image-path: controlloop/packages/docker-controlloop/target/policy-pdpd-cl image: policy-pdpd-cl registry: nexus3.onap.org:10003 patch: 1.4.0-SNAPSHOT version: 1.4-SNAPSHOT timestamp: 20190207T220835 TAGS: BUILD: verify: onap/policy-pdpd-cl:latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z merge: onap/policy-pdpd-cl:latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z release: onap/policy-pdpd-cl:latest nexus3.onap.org:10003/onap/policy-pdpd-cl:latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-STAGING-20190207T220835Z PUSH: verify: merge: nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z release: nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-STAGING-20190207T220835Z SYNTAX: docker-cl [--help|-h] [--build|-b ] [--push|-p ] [--verify|-v] [--merge|-m] [--release|-r] [--run ] [--cmd ] Change-Id: I0917c0bca212fc0b543e52ae1615c513d43f7d93 Issue-ID: POLICY-1505 Signed-off-by: Jorge Hernandez --- controlloop/packages/basex-controlloop/pom.xml | 2 +- .../packages/basex-controlloop/src/assembly/zip.xml | 2 +- .../src/main/resources/apps-controlloop-version | 21 --------------------- .../src/main/resources/controlloop.version | 21 +++++++++++++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version create mode 100644 controlloop/packages/basex-controlloop/src/main/resources/controlloop.version (limited to 'controlloop/packages/basex-controlloop') diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml index 593016816..1d3fe3d3d 100644 --- a/controlloop/packages/basex-controlloop/pom.xml +++ b/controlloop/packages/basex-controlloop/pom.xml @@ -54,7 +54,7 @@ src/main/resources - apps-controlloop-version + controlloop.version true diff --git a/controlloop/packages/basex-controlloop/src/assembly/zip.xml b/controlloop/packages/basex-controlloop/src/assembly/zip.xml index caa943c21..ba1af668d 100644 --- a/controlloop/packages/basex-controlloop/src/assembly/zip.xml +++ b/controlloop/packages/basex-controlloop/src/assembly/zip.xml @@ -37,7 +37,7 @@ 755 700 - apps-controlloop-version + controlloop.version diff --git a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version b/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version deleted file mode 100644 index 066e5712e..000000000 --- a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version +++ /dev/null @@ -1,21 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2019 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========================================================= -### - -APPS_CONTROLLOOP_VERSION=${project.version} diff --git a/controlloop/packages/basex-controlloop/src/main/resources/controlloop.version b/controlloop/packages/basex-controlloop/src/main/resources/controlloop.version new file mode 100644 index 000000000..066e5712e --- /dev/null +++ b/controlloop/packages/basex-controlloop/src/main/resources/controlloop.version @@ -0,0 +1,21 @@ +### +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2019 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========================================================= +### + +APPS_CONTROLLOOP_VERSION=${project.version} -- cgit 1.2.3-korg