From 7f9465928d5b149e4fb5f9bc476b8cb7298436fc Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 7 Dec 2015 01:01:22 +0100
Subject: start refreshing application pma
---
Services/php/Dockerfile | 10 +---------
Services/php/README.md | 18 ++++++++----------
Services/php/docker-compose.yml | 7 +++----
Services/php/httpd.conf | 2 +-
4 files changed, 13 insertions(+), 24 deletions(-)
(limited to 'Services/php')
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 7cb96b5..58653a8 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -8,19 +8,11 @@ RUN dnf -y install php php-pecl-mongo php-cli php-pear \
php-bcmath php-pecl-zip php-php-gettext php-tcpdf \
php-tcpdf-dejavu-sans-fonts php-tidy \
&& dnf clean all
-ENV LOG_PATH=/data/logs/apache_php \
- APP_PATH=/data/apache_php \
- STARTUPLOG=/data/logs/apache_php/startup.log \
- TMP_APP_PATH=/tmp/apache
COPY httpd.conf $HTTPDCONF
COPY php.ini /etc/php.d/sx.ini
COPY run.sh /bin/
RUN chmod 775 /bin/run.sh && \
- chmod ug+r $HTTPDCONF && \
- mkdir -p $TMP_APP_PATH && \
- mkdir -p $APP_PATH && \
- mkdir -p $LOG_PATH && \
- touch $STARTUPLOG
+ chmod ug+r $HTTPDCONF
COPY ./ $TMP_APP_PATH
RUN rm -f $TMP_APP_PATH/Dockerfile $TMP_APP_PATH/httpd.conf $TMP_APP_PATH/run.sh && \
chown -R apache:apache $TMP_APP_PATH $APP_PATH $LOG_PATH && \
diff --git a/Services/php/README.md b/Services/php/README.md
index ffce3c7..4e350b3 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -29,10 +29,9 @@ service:
CONTAINER_SERVICE: "php"
CONTAINER_INSTANCE: "service-php"
SERVER_NAME: "localhost"
- DOC_ROOT: "/data/apache_php"
volumes:
- - "/tmp/container/logs/php:/data/logs/apache_php"
- - "/tmp/container/php:/data/apache_php"
+ - "/tmp/container/logs/php:/data/logs/apache"
+ - "/tmp/container/php:/data/apache"
```
## Docker-compose in various situations
@@ -91,9 +90,8 @@ CMD ["/bin/run.sh"]
| CONTAINER_SERVICE | `string` | `no` | Define the type of service or application provided
| SERVER_NAME | `string` | `no` | Server name for this container. If no name localhost will be assigned
| HOSTNAME | `auto` | `auto` | Container unique id automatically assigned by docker daemon at startup
-| DOC_ROOT | `auto` | `auto` | document root, will use the $APP_PATH variable
-| LOG_PATH | `auto` | `auto` | default set to /data/logs/apache_php and used as a volume mountpoint
-| APP_PATH | `auto` | `auto` | default set to /data/apache_php and used as a volume mountpoint
+| LOG_PATH | `auto` | `auto` | default set to /data/logs/apache and used as a volume mountpoint
+| APP_PATH | `auto` | `auto` | default set to /data/apache and used as a volume mountpoint
## Exposed port
@@ -106,8 +104,8 @@ CMD ["/bin/run.sh"]
| Container directory | Description |
|----------------------|--------------------------------------------------------------------------|
-| /data/logs/apache_php | log directory used to record container and php logs
-| /data/apache_php | data directory served by php. If empty will be filled with app on startup. In other case use content from mountpoint or data volumes
+| /data/logs/apache | log directory used to record container and php logs
+| /data/apache | data directory served by php. If empty will be filled with app on startup. In other case use content from mountpoint or data volumes
## Testing the service
@@ -128,8 +126,8 @@ You must have a working environment with the source code of this repository. Rea
1. Jump into the container directory with `cd Services/php`
2. Build the container using `docker build -t sv-php .`
3. Run this container
- 1. Interactively with `docker run -p 80:80 -v /data/logs/apache_php -it sv-php`. If you add a second parameter (like `/bin/bash`) to will run this command instead of the default entrypoint. Usefull to interact with this container (ex: `/bin/bash`, `/bin/ps -a`, `/bin/df -h`,...)
- 2. As a daemon with `docker run -p 80:80 -v /data/logs/apache_php -d sv-php`
+ 1. Interactively with `docker run -p 80:80 -v /data/logs/apache -it sv-php`. If you add a second parameter (like `/bin/bash`) to will run this command instead of the default entrypoint. Usefull to interact with this container (ex: `/bin/bash`, `/bin/ps -a`, `/bin/df -h`,...)
+ 2. As a daemon with `docker run -p 80:80 -v /data/logs/apache -d sv-php`
### Build & run a container using `docker-compose`
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 16a5496..22b7585 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -11,9 +11,8 @@ server:
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "php"
- CONTAINER_INSTANCE: "service-apache_php"
+ CONTAINER_INSTANCE: "service-php"
SERVER_NAME: "localhost"
- DOC_ROOT: "/data/apache_php"
volumes:
- - "/tmp/container/logs/apache_php:/data/logs/apache_php"
- - "/tmp/container/apache_php:/data/apache_php"
\ No newline at end of file
+ - "/tmp/container/logs/php:/data/logs/apache"
+ - "/tmp/container/php:/data/apache"
\ No newline at end of file
diff --git a/Services/php/httpd.conf b/Services/php/httpd.conf
index 9cbe16a..e469e57 100644
--- a/Services/php/httpd.conf
+++ b/Services/php/httpd.conf
@@ -1,7 +1,7 @@
#
# This file will be copied into /etc/httpd/conf.d/app.conf and loaded when httpd start
#
-DocumentRoot ${DOC_ROOT}
+DocumentRoot ${APP_PATH}
ServerName ${SERVER_NAME}
ServerAdmin cl@startx.fr
--
cgit v1.2.3