Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-28 07:27:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'harpoon-nami'

Browse Source
This commit is contained in:
Sameer Naik
2016-09-07 11:26:17 +05:30
parent 97bea096e6 33267f37ca
commit ddf54d84d6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bitnami/phpbb/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>
@@ -7,10 +7,10 @@ ENV BITNAMI_APP_NAME=phpbb \
PATH=/opt/bitnami/mysql/bin/:/opt/bitnami/php/bin/:$PATH
# Additional modules required
RUN bitnami-pkg unpack apache-2.4.20-0 --checksum ec415b0938e6df70327055c5be50f80b1307b785fa5bbd04c94a4077519e5dba
RUN bitnami-pkg unpack php-5.6.22-0 --checksum 2439cf0adfc7cc21f15a6136059883e749958af83a082108e63a80ff3c5290c0
RUN bitnami-pkg install libphp-5.6.21-0 --checksum 8c1f994108eb17c69b00ac38617997b8ffad7a145a83848f38361b9571aeb73e
RUN bitnami-pkg install mysql-client-10.1.13-1 --checksum e16c0ace5cb779b486e52af83a56367f26af16a25b4ab92d8f4293f1bf307107
RUN bitnami-pkg unpack apache-2.4.23-2 --checksum be3c28581f363e240f04c2d32bcf2d4a5ea0926722bb23ab9f5dfb38bde22bac
RUN bitnami-pkg unpack php-5.6.25-0 --checksum f0e8d07d155abdb5d6843931d3ffbf9b4208fff248c409444fdd5a8e3a3da01d
RUN bitnami-pkg install libphp-5.6.21-2 --checksum 83d19b750b627fa70ed9613504089732897a48e1a7d304d8d73dec61a727b222
RUN bitnami-pkg install mysql-client-10.1.13-4 --checksum 14b45c91dd78b37f0f2366712cbe9bfdf2cb674769435611955191a65dbf4976
# Install phpbb
RUN bitnami-pkg unpack phpbb-3.1.9-0 --checksum 440c119a357bb08e86e3bc184026482dea8e1780f65e28d50cf6e743dbd3e60d
@@ -23,4 +23,4 @@ EXPOSE 80 443
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["harpoon", "start", "--foreground", "apache"]
CMD ["nami", "start", "--foreground", "apache"]

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

@@ -3,14 +3,14 @@ set -e
function initialize {
# Package can be "installed" or "unpacked"
status=`harpoon inspect $1`
status=`nami inspect $1`
if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
# Clean up inputs
inputs=""
if [[ -f /$1-inputs.json ]]; then
inputs=--inputs-file=/$1-inputs.json
fi
harpoon initialize $1 $inputs
nami initialize $1 $inputs
fi
}
@@ -24,7 +24,7 @@ export MARIADB_USER=${MARIADB_USER:-"root"}
export MARIADB_HOST=${MARIADB_HOST:-"mariadb"}
export MARIADB_PORT=${MARIADB_PORT:-"3306"}
if [[ "$1" == "harpoon" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
for module in apache php phpbb; do
initialize $module
done