Set the default memory limit for all versions to 1024MB (#12)

* memlimit * rename memlimit conf to 00 to make sure it can be overriden by client * up default memory limit to 1024MB * load memlimit later so it does not get overriden * fix php 7.1 file
graze · Nov 7, 2017 · 64cf9b8 · 64cf9b8
1 parent c9de4f0
commit 64cf9b8
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 18 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -44,8 +44,8 @@ ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php5-dev php5-p
 
 RUN set -xe \
     && apk add --no-cache \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml-1.3.1 memcached-2.2.0 \

diff --git a/5.6/Dockerfile.debug b/5.6/Dockerfile.debug
@@ -45,8 +45,8 @@ ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php5-dev php5-p
 
 RUN set -xe \
     && apk add --no-cache \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml-1.3.1 memcached-2.2.0 \

diff --git a/5.6/php/php.ini b/5.6/php/php.ini
@@ -259,7 +259,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 2048M
+memory_limit = 1024M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;

diff --git a/5.6/php5.6.bats b/5.6/php5.6.bats
@@ -143,3 +143,11 @@ readonly container="graze/php-alpine:5.6"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/5.6/php5.6_debug.bats b/5.6/php5.6_debug.bats
@@ -144,3 +144,11 @@ readonly container="graze/php-alpine:5.6-test"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -45,12 +45,12 @@ RUN apk add --no-cache \
 
 # install and remove building packages
 ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php7-dev php7-pear \
-        yaml-dev pcre-dev zlib-dev libmemcached-dev cyrus-sasl-dev
+    yaml-dev pcre-dev zlib-dev libmemcached-dev cyrus-sasl-dev
 
 RUN set -xe \
     && apk add --no-cache \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml apcu memcached \

diff --git a/7.0/Dockerfile.debug b/7.0/Dockerfile.debug
@@ -46,12 +46,12 @@ RUN apk add --no-cache \
 
 # install and remove building packages
 ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php7-dev php7-pear \
-        yaml-dev pcre-dev zlib-dev libmemcached-dev cyrus-sasl-dev
+    yaml-dev pcre-dev zlib-dev libmemcached-dev cyrus-sasl-dev
 
 RUN set -xe \
     && apk add --no-cache \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml apcu memcached \

diff --git a/7.0/php/php.ini b/7.0/php/php.ini
@@ -259,7 +259,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 2048M
+memory_limit = 1024M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;

diff --git a/7.0/php7.0.bats b/7.0/php7.0.bats
@@ -143,3 +143,11 @@ readonly container="graze/php-alpine:7.0"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/7.0/php7.0_debug.bats b/7.0/php7.0_debug.bats
@@ -151,3 +151,11 @@ readonly container="graze/php-alpine:7.0-test"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -54,8 +54,8 @@ ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php7-dev php7-p
 
 RUN set -xe \
     && apk add --no-cache --repository "http://dl-cdn.alpinelinux.org/alpine/edge/testing" \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml \
@@ -64,6 +64,8 @@ RUN set -xe \
     && rm -rf /tmp/* \
     && apk del .phpize-deps
 
+COPY php/conf.d/00_memlimit.ini /etc/php7/conf.d/00_memlimit.ini
+
 WORKDIR /srv
 
 ARG BUILD_DATE

diff --git a/7.1/Dockerfile.debug b/7.1/Dockerfile.debug
@@ -55,8 +55,8 @@ ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c php7-dev php7-p
 
 RUN set -xe \
     && apk add --no-cache --repository "http://dl-cdn.alpinelinux.org/alpine/edge/testing" \
-        --virtual .phpize-deps \
-        $PHPIZE_DEPS \
+    --virtual .phpize-deps \
+    $PHPIZE_DEPS \
     && sed -i 's/^exec $PHP -C -n/exec $PHP -C/g' $(which pecl) \
     && pecl channel-update pecl.php.net \
     && pecl install yaml \
@@ -65,6 +65,8 @@ RUN set -xe \
     && rm -rf /tmp/* \
     && apk del .phpize-deps
 
+COPY php/conf.d/00_memlimit.ini /etc/php7/conf.d/00_memlimit.ini
+
 WORKDIR /srv
 
 ARG BUILD_DATE

diff --git a/7.1/php/conf.d/00_memlimit.ini b/7.1/php/conf.d/00_memlimit.ini
@@ -0,0 +1,3 @@
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 1024M
diff --git a/7.1/php7.1.bats b/7.1/php7.1.bats
@@ -143,3 +143,11 @@ readonly container="graze/php-alpine:7.1"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/7.1/php7.1_debug.bats b/7.1/php7.1_debug.bats
@@ -151,3 +151,11 @@ readonly container="graze/php-alpine:7.1-test"
   [ "$status" -eq 0 ]
   [ "$output" = "" ]
 }
+
+@test "php should have a memory limit of 1024M" {
+  run bash -c "docker run --rm ${container} php -i | grep memory_limit"
+  echo "status: $status"
+  echo "output: $output"
+  [ "$status" -eq 0 ]
+  [ "$output" = "memory_limit => 1024M => 1024M" ]
+}
diff --git a/Makefile b/Makefile
@@ -29,8 +29,8 @@ deploy: deploy-5.6 deploy-7.0 deploy-7.1
 
 build-%: cache ?=--pull --no-cache
 build-%: ## build a generic image
-	docker build $(build_args) ${cache} -t graze/php-alpine:$* $*/.
-	docker build $(build_args) ${cache} -t graze/php-alpine:$*-test -f $*/Dockerfile.debug $*/.
+	docker build ${build_args} ${cache} -t graze/php-alpine:$* $*/.
+	docker build ${build_args} ${cache} -t graze/php-alpine:$*-test -f $*/Dockerfile.debug $*/.
 
 clean-%: ## Clean up the images
 	docker rmi $$(docker images -q graze/php-alpine:$**) || echo "no images"