aboutsummaryrefslogtreecommitdiffstats
path: root/httpserver
diff options
context:
space:
mode:
authormarcinrzepeckiwroc <marcin.rzepecki@nokia.com>2021-01-08 13:03:06 +0100
committerMarcin Rzepecki <marcin.rzepecki@nokia.com>2021-01-08 12:10:12 +0000
commita33615dacc97032e0b6399aee792f5fa424e9283 (patch)
tree06865636e3608f589adbf4429bfc74b6be130baa /httpserver
parent23f606075360a376a8fdb9f7fb1f3505c3100c1a (diff)
Update Pnf simulator version to 1.0.2
Add pom for Http Server Issue-ID: INT-1814 Signed-off-by: marcinrzepeckiwroc <marcin.rzepecki@nokia.com> Change-Id: I86b18a38a4d21c42d4bf321c73ba3d2bbce24742
Diffstat (limited to 'httpserver')
-rw-r--r--httpserver/Makefile2
-rw-r--r--httpserver/docker-compose.yml2
-rw-r--r--httpserver/pom.xml119
3 files changed, 121 insertions, 2 deletions
diff --git a/httpserver/Makefile b/httpserver/Makefile
index 8b64af5..e3bae34 100644
--- a/httpserver/Makefile
+++ b/httpserver/Makefile
@@ -3,7 +3,7 @@ default:
build-http-server:
@echo "##### Build http server docker image #####"
- docker build . -t http-server
+ docker build . -t onap/org.onap.integration.simulators.httpserver
@echo "##### DONE #####"
start-http-server:
diff --git a/httpserver/docker-compose.yml b/httpserver/docker-compose.yml
index c4479af..db1ee4b 100644
--- a/httpserver/docker-compose.yml
+++ b/httpserver/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.1"
services:
http-server:
- image: http-server
+ image: onap/org.onap.integration.simulators.httpserver
ports:
- "7080:80"
- "7443:443"
diff --git a/httpserver/pom.xml b/httpserver/pom.xml
new file mode 100644
index 0000000..a1f0bab
--- /dev/null
+++ b/httpserver/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ============LICENSE_START=======================================================
+ Simulator
+ ================================================================================
+ Copyright (C) 2020 Nokia. 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
+ <artifactId>integration-pnf-simulator</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>httpserver</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+ <docker.registry>nexus3.onap.org:10003</docker.registry>
+ <docker.image.tag>latest</docker.image.tag>
+ <dependency.directory.name>libs</dependency.directory.name>
+ <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location>
+ <proxy>""</proxy>
+ </properties>
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <os.detected.name>linux</os.detected.name>
+ <os.detected.arch>x86_64</os.detected.arch>
+ <os.detected.classifier>${os.detected.name}-${os.detected.arch}</os.detected.classifier>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>docker-build-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>docker-push-image</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skipPush>${skipDockerPush}</skipPush>
+ <verbose>true</verbose>
+ <imagePullPolicy>IfNotPresent</imagePullPolicy>
+ <images>
+ <image>
+ <alias>${project.artifactId}</alias>
+ <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
+ <registry>${onap.nexus.dockerregistry.daily}</registry>
+ <build>
+ <dockerFileDir>${project.basedir}</dockerFileDir>
+ <tags>
+ <tag>${project.version}-STAGE-${maven.build.timestamp}Z</tag>
+ </tags>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Integration simulators Release Repository</name>
+ <url>${nexusproxy}${releaseNexusPath}</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>Integration simulators Snapshot Repository</name>
+ <url>${nexusproxy}${snapshotNexusPath}</url>
+ </snapshotRepository>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexusproxy}${sitePath}</url>
+ </site>
+ </distributionManagement>
+
+</project>