Move httpserver from pnf-simulator repo to nf-simulator/pm-https-server

Change-Id: I57c8852c0f573c524db6a8da07a1b64966a3402c
Issue-ID: INT-1869
Signed-off-by: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>

4 files changed, 13 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index 2a86bfa..4f727c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,14 @@ ENV APACHE_LOG_DIR /var/log/apache2
 ENV APACHE_LOCK_DIR /var/lock/apache2
 ENV APACHE_PID_FILE /var/run/apache2.pid
 
-COPY --chown=root:root target/ /
+COPY --chown=root:root resources/local/.htpasswd /usr/local/apache2/passwd/
+COPY --chown=root:root resources/local/upload.php /usr/local/apache2/conf/
+COPY --chown=root:root resources/sites-enabled/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+COPY --chown=root:root resources/ports.conf resources/apache2.conf /etc/apache2/
+COPY --chown=root:root resources/cert/* /etc/apache2/certs/
+COPY --chown=root:root resources/lib/libjwt.so.1.7.0 /usr/lib/x86_64-linux-gnu/libjwt.so.1
+COPY --chown=root:root resources/modules/mod_authnz_jwt.so /usr/local/apache2/modules/mod_authnz_jwt.so
+COPY --chown=root:root resources/mods-enabled/auth_jwt.load /etc/apache2/mods-enabled/auth_jwt.load
 
 RUN chmod 644 /usr/local/apache2/passwd/.htpasswd \
   && chmod 644 /usr/local/apache2/conf/httpd.conf \
diff --git a/Makefile b/Makefile
index 1a0064a..8aa7f44 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,6 @@ default:
 	@echo "There is no default target. Use: make <specific_target>"
 build:
 	@echo "##### Build PM Https Server docker image #####"
-	mkdir -p target/usr/local/apache2/passwd/ && cp resources/local/.htpasswd target/usr/local/apache2/passwd/
-	mkdir -p target/usr/local/apache2/conf/ && cp resources/local/upload.php target/usr/local/apache2/conf/
-	mkdir -p target/etc/apache2/sites-enabled/ && cp resources/sites-enabled/000-default.conf target/etc/apache2/sites-enabled/000-default.conf
-	cp resources/ports.conf target/etc/apache2/
-	cp resources/apache2.conf target/etc/apache2/
-	mkdir -p target/etc/apache2/certs && cp resources/cert/* target/etc/apache2/certs
-	mkdir -p target/usr/lib/x86_64-linux-gnu/ && cp resources/lib/libjwt.so.1.7.0 target/usr/lib/x86_64-linux-gnu/libjwt.so.1
-	mkdir -p target/usr/local/apache2/modules/ && cp resources/modules/mod_authnz_jwt.so target/usr/local/apache2/modules/mod_authnz_jwt.so
-	mkdir -p target//etc/apache2/mods-enabled/ && cp resources/mods-enabled/auth_jwt.load target/etc/apache2/mods-enabled/auth_jwt.load
 	docker build . -t onap/org.onap.integration.simulators.pmhttpsserver
 	@echo "##### DONE #####"
 start:
diff --git a/README.md b/README.md
index 792820c..96ef8cc 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ make start
 make stop
 ```
 
-### Use event with PM Https Server
+### Upload file to PM Https Server
 ```
 make upload-file
 ```
diff --git a/pom.xml b/pom.xml
index ffd5602..11f1ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,9 @@
   <version>1.0.0-SNAPSHOT</version>
 
   <properties>
+    <docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
+    <docker.image.tag>latest</docker.image.tag>
+    <docker.image.name>onap/${project.artifactId}</docker.image.name>
     <nexusproxy>https://nexus.onap.org</nexusproxy>
     <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
     <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -86,7 +89,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
+                                    <name>${onap.nexus.dockerregistry.daily}/${docker.image.name}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>