diff options
Diffstat (limited to 'packages/docker')
| -rw-r--r-- | packages/docker/pom.xml | 3 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 14 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/do-start.sh | 7 |
3 files changed, 10 insertions, 14 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index f1ba74ce2..38f8ab4a1 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>packages</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>docker</artifactId> @@ -84,7 +84,6 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.30.0</version> <!-- Extract this as a property from the policy-parent --> <configuration> <verbose>true</verbose> <apiVersion>1.23</apiVersion> diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 7ef47b423..ce7c95482 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-common-alpine:1.4.0 +FROM onap/policy-jdk-debian:2.0.1 LABEL maintainer="Policy Team" @@ -8,12 +8,12 @@ ARG POLICY_LOGS=/var/log/onap ENV BUILD_VERSION_ENGINE ${BUILD_VERSION_ENGINE} ENV POLICY_LOGS ${POLICY_LOGS} -RUN apk add --no-cache mariadb-client - -RUN mkdir -p /tmp/policy-install ${POLICY_LOGS} && \ - chown policy:policy /tmp/policy-install ${POLICY_LOGS} && \ - rmdir ${POLICY_HOME}/etc/ssl && \ - rmdir ${POLICY_HOME}/etc +RUN apt update && \ + apt-get install -y mariadb-client && \ + apt-get install -y netcat && \ + apt-get install -y cron && \ + mkdir -p /tmp/policy-install ${POLICY_LOGS} && \ + chown policy:policy /tmp/policy-install ${POLICY_LOGS} WORKDIR /tmp/policy-install diff --git a/packages/docker/src/main/docker/do-start.sh b/packages/docker/src/main/docker/do-start.sh index c655ce90a..63bac6ea2 100644 --- a/packages/docker/src/main/docker/do-start.sh +++ b/packages/docker/src/main/docker/do-start.sh @@ -3,7 +3,7 @@ #============LICENSE_START================================================== # ONAP Policy Engine #=========================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2020 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. @@ -112,9 +112,6 @@ if [[ $container == pap ]]; then ./wait-for-port.sh brmsgw 9989 ./wait-for-port.sh nexus 8081 ./wait-for-port.sh drools 6969 - # wait addional 1 minute for all processes to get fully initialized and synched up - sleep 60 - bash -xv config/push-policies.sh fi -sleep 1000d +sleep infinity |