diff options
| author |   Michael O'Brien <frank.obrien@amdocs.com> | 2018-06-25 13:59:31 -0400 |
|---|---|---|
| committer | Michael O'Brien <frank.obrien@amdocs.com> | 2018-07-10 23:45:29 -0400 |
| commit | 9eee6ac9daa5b82946b4f7c7eaa817ae3e1f4cab (patch) | |
| tree | c92bf95da779589a1162044b4f77a51876fccb7b /reference/logging-docker-root | |
| parent | 9aaa8f39949d7dc3d66888797951a20a7bced145 (diff) | |
logging library use and k8s
Change-Id: I264f6dd5270543a216612c50fd5806458e0e806a
Issue-ID: LOG-135
Signed-off-by: Michael O'Brien <frank.obrien@amdocs.com>
Diffstat (limited to 'reference/logging-docker-root')
5 files changed, 60 insertions, 4 deletions
diff --git a/reference/logging-docker-root/logging-docker-demo-service/DockerFile b/reference/logging-docker-root/logging-docker-demo-service/DockerFile new file mode 100644 index 0000000..bb9a7cf --- /dev/null +++ b/reference/logging-docker-root/logging-docker-demo-service/DockerFile @@ -0,0 +1,2 @@ +FROM tomcat:8.0.48-jre8 +COPY target/logging-demo-*-SNAPSHOT.war /usr/local/tomcat/webapps/logging-demo.war diff --git a/reference/logging-docker-root/logging-docker-demo-service/build.sh b/reference/logging-docker-root/logging-docker-demo-service/build.sh new file mode 100755 index 0000000..247b1ee --- /dev/null +++ b/reference/logging-docker-root/logging-docker-demo-service/build.sh @@ -0,0 +1,31 @@ +#!/bin/bash +############################################################################# +# +# Copyright © 2018 Amdocs. +# +# 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. +# +############################################################################# +# v20180625 +# https://wiki.onap.org/display/DW/Cloud+Native+Deployment +# source from https://jira.onap.org/browse/LOG-135 +# Michael O'Brien + +mkdir target +# reuse the same war for the service pods +cp ../../logging-demo/target/*.war target +docker build -t oomk8s/logging-demo-service -f DockerFile . +docker images | grep logging-demo-service +docker tag oomk8s/logging-demo-service oomk8s/logging-demo-service:0.0.3 +docker login +docker push oomk8s/logging-demo-service:0.0.3 +#docker run -d -it --rm -p 8888:8080 oomk8s/logging-demo-service:latest diff --git a/reference/logging-docker-root/logging-docker-demo/DockerFile b/reference/logging-docker-root/logging-docker-demo/DockerFile index b3d68f0..bb9a7cf 100644 --- a/reference/logging-docker-root/logging-docker-demo/DockerFile +++ b/reference/logging-docker-root/logging-docker-demo/DockerFile @@ -1,2 +1,2 @@ FROM tomcat:8.0.48-jre8 -COPY target/logging-demo-1.2.0-SNAPSHOT.war /usr/local/tomcat/webapps/logging-demo.war +COPY target/logging-demo-*-SNAPSHOT.war /usr/local/tomcat/webapps/logging-demo.war diff --git a/reference/logging-docker-root/logging-docker-demo/build.sh b/reference/logging-docker-root/logging-docker-demo/build.sh index d2e0ea2..491c64c 100755 --- a/reference/logging-docker-root/logging-docker-demo/build.sh +++ b/reference/logging-docker-root/logging-docker-demo/build.sh @@ -1,8 +1,31 @@ +#!/bin/bash +############################################################################# +# +# Copyright © 2018 Amdocs. +# +# 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. +# +############################################################################# +# v20180625 +# https://wiki.onap.org/display/DW/Cloud+Native+Deployment +# source from https://jira.onap.org/browse/LOG-135 +# Michael O'Brien + + mkdir target cp ../../logging-demo/target/*.war target docker build -t oomk8s/logging-demo-nbi -f DockerFile . docker images | grep logging-demo-nbi -docker tag oomk8s/logging-demo-nbi oomk8s/logging-demo-nbi:0.0.1 +docker tag oomk8s/logging-demo-nbi oomk8s/logging-demo-nbi:0.0.3 docker login -docker push oomk8s/logging-demo-nbi:0.0.1 +docker push oomk8s/logging-demo-nbi:0.0.3 #docker run -d -it --rm -p 8888:8080 oomk8s/logging-demo-nbi:latest diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml index 771856e..42239a6 100644 --- a/reference/logging-docker-root/pom.xml +++ b/reference/logging-docker-root/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.2-SNAPSHOT</version> </parent> <artifactId>logging-docker-root</artifactId> <packaging>pom</packaging> |