From 59bbf66b7b1e4490694f2c5f732ddf9380acf053 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 28 Nov 2015 20:11:25 +0100
Subject: debugging on services. renaming service and use of extends in global
docker-copose used in test
---
Services/php/Dockerfile | 4 ++--
Services/php/README.md | 2 +-
Services/php/docker-compose.yml | 18 +++++++++---------
Services/php/php.ini | 1 -
4 files changed, 12 insertions(+), 13 deletions(-)
(limited to 'Services/php')
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 8bb0304..62b9564 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -8,8 +8,8 @@ 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/httpd_php \
- APP_PATH=/data/httpd_php
+ENV LOG_PATH=/data/logs/apache_php \
+ APP_PATH=/data/apache_php
COPY httpd.conf $HTTPDCONF
COPY php.ini /etc/php.d/sx.ini
COPY run.sh /bin/
diff --git a/Services/php/README.md b/Services/php/README.md
index 370a3a8..7ceef27 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -6,7 +6,7 @@ Container running apache + php daemon under a fedora server
docker run -d -p 80:80 --name="php" startx/sv-php
# when used with a volume container (run data container, then run service)
- docker run -d -v /var/www/html -v /var/logs/httpd --name php-data startx/sv-php echo "Data container for php webserver"
+ docker run -d -v /var/www/html -v /var/logs/apache_php --name php-data startx/sv-php echo "Data container for php webserver"
docker run -d -p 80:80 --volumes-from php-data --name="php" startx/sv-php
when linked to another container
docker run -d --name="mongo" startx/sv-mongo
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 2f410ce..04f7ac3 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -1,17 +1,17 @@
-httpd_php:
+server:
build: ./
-# image: sx-httpd_php
- container_name: "sx-httpd_php"
+# image: sx-php
+ container_name: "php-server"
mem_limit: 1g
memswap_limit: 2g
- cpu_shares: 2
+ cpu_shares: 4
restart: "on-failure:2"
environment:
CONTAINER_TYPE: "service"
- CONTAINER_SERVICE: "httpd_php"
- CONTAINER_INSTANCE: "sx-httpd_php"
+ CONTAINER_SERVICE: "php"
+ CONTAINER_INSTANCE: "service-apache_php"
SERVER_NAME: "localhost"
- DOC_ROOT: "/data/httpd_php"
+ DOC_ROOT: "/data/apache_php"
volumes:
- - "/tmp/container/logs/httpd_php:/data/logs/httpd_php"
- - "/tmp/container/httpd_php:/data/httpd_php"
\ No newline at end of file
+ - "/tmp/container/logs/apache_php:/data/logs/apache_php"
+ - "/tmp/container/apache_php:/data/apache_php"
\ No newline at end of file
diff --git a/Services/php/php.ini b/Services/php/php.ini
index 4207ce3..133ab2c 100644
--- a/Services/php/php.ini
+++ b/Services/php/php.ini
@@ -1,4 +1,3 @@
-; This file will be copied into /etc/php.d/sx.ini and loaded when httpd start
display_errors = On
always_populate_raw_post_data = On
--
cgit v1.2.3