summaryrefslogtreecommitdiffstats
path: root/asdctool
diff options
context:
space:
mode:
Diffstat (limited to 'asdctool')
-rw-r--r--asdctool/pom.xml16
-rw-r--r--asdctool/sdc-cassandra-init/Dockerfile6
2 files changed, 18 insertions, 4 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 231104edb9..a0423a3b77 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -38,6 +38,12 @@
<artifactId>common-app-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -329,6 +335,10 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -419,6 +429,12 @@
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index 33d8738278..979ab6f364 100644
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -1,8 +1,6 @@
-FROM onap/policy-jdk-debian:2.0.1
+FROM onap/policy-jdk-debian:2.0.2
-#RUN addgroup --gid 1000 sdc
RUN addgroup sdc
-#RUN adduser --gecos "sdc sdc,1,1,1" -u 1000 --disabled-password --ingroup sdc --shell /bin/sh sdc
RUN adduser --gecos "sdc sdc,1,1,1" --disabled-password --ingroup sdc --shell /bin/sh sdc
USER sdc
RUN mkdir ~/.cassandra/ && \
@@ -11,6 +9,7 @@ RUN mkdir ~/.cassandra/ && \
USER root
RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip && \
+ python -m pip install --upgrade pip \
pip install cqlsh && \
mkdir ~/.cassandra/ && \
echo '[cql]' > ~/.cassandra/cqlshrc && \
@@ -35,4 +34,3 @@ COPY --chown=sdc:sdc startup.sh /home/sdc/
RUN chmod 770 /home/sdc/startup.sh
ENTRYPOINT [ "/home/sdc/startup.sh" ]
-