diff options
| author |   Prudence Au <prudence.au@amdocs.com> | 2018-08-23 20:29:35 -0400 |
|---|---|---|
| committer | Prudence Au <prudence.au@amdocs.com> | 2018-08-24 07:21:19 -0400 |
| commit | a2c10f7b5097b2dda32288706e1c41ebbdfd7ab1 (patch) | |
| tree | 9710be92b223e3ce592b5bd2fd94daf66b91bc5a | |
| parent | 3021aebce9906aefb311d3e33f76f58c824b74e8 (diff) | |
Add docker-maven-plugin for building docker image
Change-Id: I09c4db0b9fbc2a6976b7521b2e5d45ca28a03d11
Issue-ID: LOG-427
Signed-off-by: Prudence Au <prudence.au@amdocs.com>
| -rw-r--r-- | INFO.yaml | 51 | ||||
| -rw-r--r-- | pom.xml | 26 | ||||
| -rw-r--r-- | src/main/bin/start.sh | 2 | ||||
| -rw-r--r-- | src/main/docker/Dockerfile | 2 |
4 files changed, 78 insertions, 3 deletions
diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 0000000..f2c27f1 --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,51 @@ +--- +project: 'aai-validation' +project_creation_date: '2018-08-23' +lifecycle_state: 'Incubation' +project_lead: &onap_releng_ptl + name: 'James Forsyth' + email: 'jf2512@att.com' + id: 'jimmydot' + company: 'ATT' + timezone: 'America/Detroit' +primary_contact: *onap_releng_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.onap.org/projects/AAI' + key: 'AAI' +meetings: + - type: 'zoom' + agenda: 'https://wiki.onap.org/display/DW/AAI+Meeting+Notes' + url: 'https://wiki.onap.org/pages/viewpage.action?pageId=8227676' + server: 'n/a' + channel: 'n/a' + repeats: 'weekly' + time: '14:00 UTC' +committers: + - <<: *onap_releng_ptl + - name: 'Manisha Aggarwal' + email: 'ma9181@att.com' + company: 'ATT' + id: 'ma9181' + timezone: 'America/New York' + - name: 'Steven Blimkie' + email: 'Steven.Blimkie@amdocs.com' + company: 'Amdocs' + id: 'sblimkie' + timezone: 'America/Toronto' + - name: 'Tian Lee' + email: 'TianL@amdocs.com' + company: 'Amdocs' + id: 'TianL' + timezone: 'Europe/London' + - name: 'Venkata Harish Kajur' + email: 'vk250x@att.com' + company: 'ATT' + id: 'vk250x' + timezone: 'America/New York' +tsc: + approval: 'https://lists.onap.org/pipermail/onap-tsc' + changes: + - type: 'removal' + name: 'Steve Smokowski' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-February/004361.html' @@ -71,6 +71,12 @@ limitations under the License. <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <artifactId>logback-classic</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -360,6 +366,10 @@ limitations under the License. </resource> <resource> <directory>${basedir}/src/main/bin/</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> </resource> </resources> </configuration> @@ -387,7 +397,21 @@ limitations under the License. </execution> </executions> </plugin> - + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.4.11</version> + <configuration> + <verbose>true</verbose> + <serverId>docker-hub</serverId> + <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName> + <dockerDirectory>${docker.location}</dockerDirectory> + <imageTags> + <imageTag>latest</imageTag> + </imageTags> + <forceTags>true</forceTags> + </configuration> + </plugin> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 5ba69d7..d019bd2 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -19,7 +19,7 @@ # This path is referenced in the file logback.xml. APP_HOME="${APP_HOME-/opt/app/validation-service}" -JARFILE="$APP_HOME/validation-service.jar" +JARFILE="$APP_HOME/validation.jar" LOGBACK_FILE=logback.xml # CONFIG_HOME is used as the base folder for relative paths, e.g. in the file aai-environment.properties diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 7f84abc..03dc379 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -18,7 +18,7 @@ FROM ubuntu:14.04 ARG MICRO_HOME=/opt/app/validation-service ARG BIN_HOME=$MICRO_HOME/bin ARG LOG_HOME=$MICRO_HOME/logs/AAI-VS -ARG JAR_FILE=validation-service.jar +ARG JAR_FILE=validation.jar RUN apt-get update |