aboutsummaryrefslogtreecommitdiffstats
path: root/datarouter-subscriber/src
diff options
context:
space:
mode:
Diffstat (limited to 'datarouter-subscriber/src')
-rw-r--r--datarouter-subscriber/src/main/resources/docker/Dockerfile11
-rwxr-xr-xdatarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java2
2 files changed, 10 insertions, 3 deletions
diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile
index 6c3536c2..20a2ca2b 100644
--- a/datarouter-subscriber/src/main/resources/docker/Dockerfile
+++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile
@@ -18,20 +18,25 @@
# limitations under the License.
# ============LICENSE_END====================================================
#
-FROM openjdk:8-jre-alpine
+FROM openjdk:11.0.6-jre-slim
MAINTAINER DMAAP Team
COPY /opt /opt
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ vim
+
EXPOSE 8080 8443
WORKDIR /opt
RUN chmod 0700 startup.sh
ENTRYPOINT ["sh", "startup.sh"]
-RUN addgroup -S -g 1001 onap \
- && adduser -S -u 1000 datarouter -G onap \
+RUN groupadd -g 1001 onap \
+ && useradd -u 1000 datarouter -g onap \
&& chown -R datarouter:onap /opt/
USER datarouter \ No newline at end of file
diff --git a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
index 109c63a9..006dee76 100755
--- a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
+++ b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
import javax.servlet.ServletInputStream;
@@ -40,6 +41,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*"})
public class SampleSubscriberServletTest {
private SampleSubscriberServlet sampleSubServlet;