summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2017-01-01 14:16:48 +0100
committerstartxfr <clarue@startx.fr>2017-01-01 14:16:48 +0100
commitf499157f393a851909e733c9f259a71b619c0d84 (patch)
tree312685ea4f01d4a19e2e4d5789a341114f11c679
parenta19140b2b4cac53f5ffbf96b77523a92b45b1f3f (diff)
downloadphpmyadmin-f499157f393a851909e733c9f259a71b619c0d84.tar.gz
phpmyadmin-f499157f393a851909e733c9f259a71b619c0d84.tar.bz2
phpmyadmin-f499157f393a851909e733c9f259a71b619c0d84.tar.xz
phpmyadmin-f499157f393a851909e733c9f259a71b619c0d84.zip
put php function as lib
-rw-r--r--Services/php/Dockerfile6
-rw-r--r--Services/php/run.sh30
-rw-r--r--Services/php/sx-php.sh30
3 files changed, 34 insertions, 32 deletions
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index f3e6c0e..4eeae7a 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -10,11 +10,11 @@ RUN dnf -y install php php-cli php-pear \
&& dnf clean all
COPY httpd.conf $HTTPDCONF
COPY php.ini /etc/php.d/sx.ini
-COPY run.sh /bin/
-RUN chmod 775 /bin/run.sh && \
+COPY *.sh /bin/
+RUN chmod 775 /bin/run.sh /bin/sx-php.sh && \
chmod ug+r $HTTPDCONF
COPY ./ $APP_PATH
-RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh && \
+RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh $APP_PATH/sx-php.sh && \
chown -R apache:apache $DATA_PATH $APP_PATH $LOG_PATH && \
chmod ug+r -R $DATA_PATH $APP_PATH
diff --git a/Services/php/run.sh b/Services/php/run.sh
index e3c4c86..7cd0b92 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -1,33 +1,5 @@
#!/bin/bash
-source /bin/sx-lib.sh
-source /bin/sx-httpd.sh
-
-function display_container_php_header {
- echo "+====================================================="
- echo "| Container : $HOSTNAME"
- echo "| OS : $(</etc/redhat-release)"
- echo "| HTTP engine : $(httpd -v | head -1)"
- echo "| PHP engine : $(php --version | head -1)"
- if [ -v CONTAINER_TYPE ]; then
- echo "| Type : $CONTAINER_TYPE"
- fi
- if [ -v CONTAINER_SERVICE ]; then
- echo "| Service : $CONTAINER_SERVICE"
- fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
- if [ -v SERVER_NAME ]; then
- echo "| ServerName : $SERVER_NAME"
- fi
- if [ -v APP_PATH ]; then
- echo "| App path : $APP_PATH"
- fi
- if [ -v LOG_PATH ]; then
- echo "| Log path : $LOG_PATH"
- fi
- echo "+====================================================="
-}
+source /bin/sx-php.sh
check_httpd_environment | tee -a $STARTUPLOG
setSys2HttpEnvironmentVariable $APP_PATH/.htaccess
diff --git a/Services/php/sx-php.sh b/Services/php/sx-php.sh
new file mode 100644
index 0000000..2f59a50
--- /dev/null
+++ b/Services/php/sx-php.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+source /bin/sx-lib.sh
+source /bin/sx-httpd.sh
+
+function display_container_php_header {
+ echo "+====================================================="
+ echo "| Container : $HOSTNAME"
+ echo "| OS : $(</etc/redhat-release)"
+ echo "| HTTP engine : $(httpd -v | head -1)"
+ echo "| PHP engine : $(php --version | head -1)"
+ if [ -v CONTAINER_TYPE ]; then
+ echo "| Type : $CONTAINER_TYPE"
+ fi
+ if [ -v CONTAINER_SERVICE ]; then
+ echo "| Service : $CONTAINER_SERVICE"
+ fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
+ if [ -v SERVER_NAME ]; then
+ echo "| ServerName : $SERVER_NAME"
+ fi
+ if [ -v APP_PATH ]; then
+ echo "| App path : $APP_PATH"
+ fi
+ if [ -v LOG_PATH ]; then
+ echo "| Log path : $LOG_PATH"
+ fi
+ echo "+====================================================="
+}