diff options
| author | startxfr <clarue@startx.fr> | 2015-11-29 00:44:42 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-29 00:44:42 +0100 |
| commit | 78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df (patch) | |
| tree | 13e05e8d8217a48a0d4decf8564defee11cf35ba /Services/apache | |
| parent | a490cfe364a242b1e9993225758ea6e61369e363 (diff) | |
| download | phpmyadmin-78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df.tar.gz phpmyadmin-78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df.tar.bz2 phpmyadmin-78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df.tar.xz phpmyadmin-78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df.zip | |
rewrite mongo and small updates in others
Diffstat (limited to 'Services/apache')
| -rw-r--r-- | Services/apache/Dockerfile | 2 | ||||
| -rw-r--r-- | Services/apache/docker-compose.yml | 4 | ||||
| -rw-r--r-- | Services/apache/sx-httpd.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile index a15b41a..620add6 100644 --- a/Services/apache/Dockerfile +++ b/Services/apache/Dockerfile @@ -19,7 +19,7 @@ RUN chmod 775 /bin/run.sh /bin/sx-httpd.sh && \ touch $STARTUPLOG COPY ./ $APP_PATH RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh $APP_PATH/sx-httpd.sh && \ - chown -R apache:apache $APP_PATH /data/logs + chown -R apache:apache $APP_PATH $LOG_PATH EXPOSE 80 443 VOLUME [$APP_PATH,$LOG_PATH] diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml index 8e951bc..ed68cab 100644 --- a/Services/apache/docker-compose.yml +++ b/Services/apache/docker-compose.yml @@ -2,8 +2,8 @@ server: build: ./ # image: sv-apache container_name: "apache-server" - mem_limit: 1g - memswap_limit: 2g + mem_limit: 500m + memswap_limit: 500m cpu_shares: 2 restart: "on-failure:2" environment: diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh index fb50be9..b7d368a 100644 --- a/Services/apache/sx-httpd.sh +++ b/Services/apache/sx-httpd.sh @@ -26,7 +26,7 @@ function display_container_httpd_header { echo "+=====================================================" echo "| Container : $HOSTNAME" echo "| OS : $(</etc/redhat-release)" - echo "| Engine : " httpd -v | head -1 + echo "| Engine : $(httpd -v | head -1)" if [ -v CONTAINER_TYPE ]; then echo "| Type : $CONTAINER_TYPE" fi |