diff options
| author |   PawelSzalapski <pawel.szalapski@nokia.com> | 2018-07-10 13:25:18 +0200 |
|---|---|---|
| committer | PawelSzalapski <pawel.szalapski@nokia.com> | 2018-07-13 12:31:07 +0200 |
| commit | b343343f1efd0df9196b27e9e65b783e5e954112 (patch) | |
| tree | e19094ffbbd8c2a1616ed99983a95c32cac0343b /pom.xml | |
| parent | cd66181b35300f020f197bb411d6bdf6ad2514fb (diff) | |
Clean up .sh scripts
Removed .sh scripts that are not needed.
Fill readme with a description of some of the things
that might be not visible at first glance
Refactor .sh scripts, remove not used or not needed parts
Fix a bug where pidof <package> does not work.
Change logging of the scripts and they way that app is run so
that the logs are in one place -> collector.logs
Fixed a bug where tomcat startup problems are not logged
Added log rotation with logrotate tool
Change-Id: I156328ab23d18a20072177ae8c5420772c3e2c7c
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Issue-ID: DCAEGEN2-610
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 35 |
1 files changed, 30 insertions, 5 deletions
@@ -18,8 +18,8 @@ limitations under the License. --> <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"> + 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> @@ -191,7 +191,6 @@ limitations under the License. <imageTags> <tag>latest</tag> </imageTags> - <baseImage>openjdk:8-jre-slim</baseImage> <env> <HOSTALIASES>/etc/host.aliases</HOSTALIASES> @@ -205,6 +204,10 @@ limitations under the License. </resources> <runs> <run>chmod +x bin/*.sh</run> <!-- Maven is loosing file permissions during artifacts copy --> + <run> + <![CDATA[apt-get update && apt-get install -y --no-install-recommends logrotate && apt-get clean all]]> + </run> + <run>chmod 0644 etc/logrotate.conf</run> </runs> <exposes> <expose>8080</expose> @@ -241,7 +244,8 @@ limitations under the License. </goals> <configuration> <image>${docker.image.name}:latest</image> - <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version} + </newName> <pushImage>true</pushImage> </configuration> </execution> @@ -253,7 +257,9 @@ limitations under the License. </goals> <configuration> <image>${docker.image.name}:latest</image> - <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName> + <newName> + ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z + </newName> <pushImage>true</pushImage> </configuration> </execution> @@ -262,6 +268,25 @@ limitations under the License. </plugins> </build> + <profiles> + <profile> + <id>with-system-proxy</id> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <buildArgs> + <http_proxy>${env.http_proxy}</http_proxy> + </buildArgs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <reporting> <plugins> <plugin> |