mirror of
https://github.com/bitnami/containers.git
synced 2026-02-10 21:27:26 +08:00
Apache latest version using base image
This commit is contained in:
@@ -1,22 +1,21 @@
|
||||
FROM ubuntu-debootstrap:14.04
|
||||
FROM bitnami/base-ubuntu:14.04
|
||||
MAINTAINER Bitnami
|
||||
|
||||
ENV BITNAMI_APP_NAME apache
|
||||
ENV BITNAMI_APP_VERSION 2.4.12-0
|
||||
ENV BITNAMI_APP_VERSION 2.4.12-1
|
||||
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/apache2
|
||||
ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
|
||||
ENV BITNAMI_APP_USER daemon
|
||||
|
||||
ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh
|
||||
ADD post-install.sh /post-install.sh
|
||||
COPY bitnami-apache-2.4.12-1-container-linux-x64-installer.run /tmp/installer.run
|
||||
RUN sh $BITNAMI_PREFIX/install.sh
|
||||
|
||||
RUN sh /tmp/install.sh
|
||||
RUN sh /post-install.sh /usr/local/bitnami/apache2
|
||||
|
||||
ENV PATH /usr/local/bitnami/apache2/bin:$PATH
|
||||
ENV PATH $BITNAMI_APP_DIR/bin:$PATH
|
||||
|
||||
EXPOSE 80 443
|
||||
VOLUME ["/logs", "/conf", "/app"]
|
||||
VOLUME ["$BITNAMI_APP_VOL_PREFIX/conf", "$BITNAMI_APP_VOL_PREFIX/logs", "/app"]
|
||||
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
CMD ["/usr/local/bitnami/apache2/bin/httpd", "-DFOREGROUND", "-f", "/usr/local/bitnami/apache2/conf/httpd.conf"]
|
||||
CMD ["httpd"]
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
source $BITNAMI_PREFIX/bitnami-utils.sh
|
||||
|
||||
if [ ! "$(ls -A /conf)" ]; then
|
||||
cp -r /usr/local/bitnami/apache2/conf.defaults/* /usr/local/bitnami/apache2/conf
|
||||
fi
|
||||
print_welcome_page
|
||||
generate_conf_files
|
||||
|
||||
if [ ! "$(ls -A /app)" ]; then
|
||||
cp -r /usr/local/bitnami/apache2/htdocs.defaults/* /usr/local/bitnami/apache2/htdocs
|
||||
cp -r $BITNAMI_APP_DIR/htdocs.defaults/* $BITNAMI_APP_DIR/htdocs
|
||||
fi
|
||||
|
||||
# Remove zombie pidfile
|
||||
rm -f /usr/local/bitnami/apache2/logs/httpd.pid
|
||||
rm -f $BITNAMI_APP_DIR/logs/httpd.pid
|
||||
|
||||
if [[ "$@" = 'httpd' ]]; then
|
||||
exec $@ -DFOREGROUND -f $BITNAMI_APP_DIR/conf/httpd.conf
|
||||
else
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
|
||||
@@ -1 +1 @@
|
||||
0411c7495687d011e511c8d281d8fdd9c160f95126bfa32f10d912615fbc9170 /tmp/installer.run
|
||||
a2c6e62d4b9ee110e7ef1e3dd055b509b1aec87ad2c45b83653bdf1c2243385d /tmp/installer.run
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
INSTALL_DIR=$1
|
||||
cd $INSTALL_DIR
|
||||
cd $BITNAMI_APP_DIR
|
||||
|
||||
# Backup default conf/htdocs
|
||||
mv conf conf.defaults
|
||||
mv htdocs htdocs.defaults
|
||||
|
||||
# Setup mount point symlinks
|
||||
ln -s /usr/local/bitnami/apache2/conf /conf
|
||||
ln -s /usr/local/bitnami/apache2/logs /logs
|
||||
ln -s /usr/local/bitnami/apache2/htdocs /app
|
||||
ln -s $BITNAMI_APP_DIR/conf $BITNAMI_APP_VOL_PREFIX/conf
|
||||
ln -s $BITNAMI_APP_DIR/logs $BITNAMI_APP_VOL_PREFIX/logs
|
||||
ln -s $BITNAMI_APP_DIR/htdocs /app
|
||||
|
||||
# Log to stdout
|
||||
ln -sf /dev/stdout logs/access_log
|
||||
|
||||
Reference in New Issue
Block a user