public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

`harpoon` has been renamed to `nami`

This commit is contained in:
Sameer Naik 2016-09-04 23:25:11 +05:30
parent a616b67d74
commit 00824e0200
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/tomcat/Dockerfile
View File

@ -1,4 +1,4 @@
FROM gcr.io/stacksmith-images/ubuntu:14.04-r8
FROM gcr.io/stacksmith-images/ubuntu:14.04-r9
MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_IMAGE_VERSION=8.0.35-r1 \
@ -8,14 +8,14 @@ ENV BITNAMI_IMAGE_VERSION=8.0.35-r1 \
RUN bitnami-pkg install java-1.8.0_91-0 --checksum 64cf20b77dc7cce3a28e9fe1daa149785c9c8c13ad1249071bc778fa40ae8773
ENV PATH=/opt/bitnami/java/bin:$PATH
RUN bitnami-pkg unpack tomcat-8.0.35-0 --checksum d86af6bade1325215d4dd1b63aefbd4a57abb05a71672e5f58e27ff2fd49325b
RUN bitnami-pkg unpack tomcat-8.0.36-0 --checksum e4402f645bc95011066d60250347039cd47407a6257fb5f477d8b562facdbb17
RUN ln -sf /opt/bitnami/$BITNAMI_APP_NAME/data /app
ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
COPY rootfs/ /
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["harpoon", "start", "--foreground", "tomcat"]
CMD ["nami", "start", "--foreground", "tomcat"]
VOLUME ["/bitnami/$BITNAMI_APP_NAME"]

6
bitnami/tomcat/rootfs/app-entrypoint.sh
View File

@ -1,10 +1,10 @@
#!/bin/bash
set -e
if [[ "$1" == "harpoon" && "$2" == "start" ]]; then
status=`harpoon inspect $BITNAMI_APP_NAME`
if [[ "$1" == "nami" && "$2" == "start" ]]; then
status=`nami inspect $BITNAMI_APP_NAME`
if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
harpoon initialize $BITNAMI_APP_NAME \
nami initialize $BITNAMI_APP_NAME \
${TOMCAT_USER:+--username $TOMCAT_USER} \
${TOMCAT_PASSWORD:+--password $TOMCAT_PASSWORD}
fi