summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Bochenski <piotr.bochenski@nokia.com>2018-08-28 18:59:06 +0200
committerPiotr Bochenski <piotr.bochenski@nokia.com>2018-08-28 19:03:24 +0200
commit6760926586a2205cb6614d53144c424e3e06a92c (patch)
tree61bd262d5880b3293e971b964164bf74fc3f7884
parent4ecf5ae18225d7792c337a42f1b57fbb599beda2 (diff)
Fix Docker image building misconceptions
1. Required packages can be installed in single apt-get run. 2. vim package is not necessary since there is vi already included in base image. 3. cmd was changed to entryPoint which breaks the ability to run image with different command as staring point (cmd is passed as an argument to entrypoint). Revert this change. Change-Id: I47e128a5702200efe7c51724d5f7c07acd8f21f9 Issue-ID: DCAEGEN2-736 Signed-off-by: Piotr Bochenski <piotr.bochenski@nokia.com>
-rw-r--r--pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 56133e34..760d1315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,16 +196,16 @@ limitations under the License.
</resource>
</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 install -y procps && apt-get install -y vim && apt-get clean all]]></run>
+ <run>chmod +x bin/*.sh</run>
+ <run><![CDATA[apt-get update && apt-get install -y --no-install-recommends logrotate procps && apt-get clean all]]></run>
<run>chmod 0644 etc/logrotate.conf</run>
</runs>
<exposes>
<expose>8080</expose>
<expose>8443</expose>
</exposes>
- <entryPoint>bin/docker-entry.sh</entryPoint>
+ <cmd>bin/docker-entry.sh</cmd>
</configuration>
<executions>
<execution>