Adding volumes and conf generation

This commit is contained in:
Miguel Martinez
2015-06-15 14:10:16 -07:00
parent 34f6708a71
commit 1397fbbac0
5 changed files with 24 additions and 2 deletions

View File

@@ -5,6 +5,7 @@ ENV BITNAMI_APP_NAME phpfpm
ENV BITNAMI_APP_VERSION 5.5.25-0
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/php
ENV BITNAMI_APP_USER bitnami
ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
RUN sh $BITNAMI_PREFIX/install.sh\
--php_fpm_allow_all_remote_connections 1 --php_fpm_connection_mode port
@@ -16,7 +17,7 @@ COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
EXPOSE 9000
VOLUME ["/app"]
VOLUME ["/app", "$BITNAMI_APP_VOL_PREFIX/logs", "$BITNAMI_APP_VOL_PREFIX/conf"]
WORKDIR /app
CMD ["php-fpm", "-F"]

View File

@@ -3,4 +3,13 @@ set -e
source $BITNAMI_PREFIX/bitnami-utils.sh
print_welcome_page
if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
generate_conf_files $BITNAMI_APP_DIR/etc
fi
if [[ "$1" = 'php-fpm' ]]; then
wait_and_tail_logs &
fi
exec "$@"

View File

@@ -2,6 +2,8 @@
VOLUMES:
/app: Default work directory for your $BITNAMI_APP_NAME application
$BITNAMI_APP_VOL_PREFIX/conf: Home of php-fpm.conf
$BITNAMI_APP_VOL_PREFIX/logs: $BITNAMI_APP_NAME logs are placed here
PORTS:
9000: Exposed port, please configure your app to use this port

View File

@@ -1,4 +1,6 @@
volumes:
/app: Default work directory for your $BITNAMI_APP_NAME application
$BITNAMI_APP_VOL_PREFIX/conf: Home of php-fpm.conf
$BITNAMI_APP_VOL_PREFIX/logs: $BITNAMI_APP_NAME logs are placed here
ports:
9000: Exposed port, please configure your app to use this port

View File

@@ -1,3 +1,11 @@
#!/bin/bash
mkdir /app
chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER /app/
# set up default config
mkdir $BITNAMI_APP_DIR/etc/conf.defaults
mkdir $BITNAMI_APP_DIR/etc/conf
mv $BITNAMI_APP_DIR/etc/php-fpm.conf $BITNAMI_APP_DIR/etc/conf.defaults
ln -s $BITNAMI_APP_DIR/etc/conf/php-fpm.conf $BITNAMI_APP_DIR/etc/php-fpm.conf
chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER /app/ $BITNAMI_APP_DIR/etc/conf $BITNAMI_APP_DIR/var/log
ln -s $BITNAMI_APP_DIR/var/log $BITNAMI_APP_VOL_PREFIX/logs
ln -s $BITNAMI_APP_DIR/etc/conf $BITNAMI_APP_VOL_PREFIX/conf