aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2017-02-20 22:58:44 +0000
committerGerrit Code Review <gerrit@openecomp.org>2017-02-20 22:58:44 +0000
commited5674337a531ed785c2b6f5acc0b2976796596b (patch)
tree3bd5182e2eec88374d36749185d2819a3d201316
parent94584fa7509d00fc6f2f9730f38d70ee89f4eae6 (diff)
parent91308354965493700cb3eb61d74bc6c2c1811d5b (diff)
Merge "Remove force update and ca-certificates"
-rw-r--r--ajsc-aai/src/main/resources/docker/Dockerfile2
-rw-r--r--pom.xml6
2 files changed, 1 insertions, 7 deletions
diff --git a/ajsc-aai/src/main/resources/docker/Dockerfile b/ajsc-aai/src/main/resources/docker/Dockerfile
index 16a785d..02d8a54 100644
--- a/ajsc-aai/src/main/resources/docker/Dockerfile
+++ b/ajsc-aai/src/main/resources/docker/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y software-properties-common
# sudo -E is required to preserve the environment
# If you remove that line, it will most like freeze at this step
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && \
+RUN apt-get install --reinstall ca-certificates && sudo -E add-apt-repository ppa:openjdk-r/ppa && \
apt-get update && \
apt-get -qq install -y openjdk-8-jre-headless git curl ksh
diff --git a/pom.xml b/pom.xml
index 266f4ae..a70eb69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,12 +92,6 @@
<id>ecomp-snapshots</id>
<name>ECOMP Snapshot Repository</name>
<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
- <snapshots>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- <releases>
- <updatePolicy>always</updatePolicy>
- </releases>
</repository>
</repositories>