From 61d9e98251cf12568fe2db77a784e90adb58b5cf Mon Sep 17 00:00:00 2001
From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
Date: Thu, 12 Nov 2020 20:55:03 +0100
Subject: [PATCH] Reset to master

---
 Dockerfile                           | 1 -
 etc/php.d/openshift-php-memlimit.ini | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 etc/php.d/openshift-php-memlimit.ini

diff --git a/Dockerfile b/Dockerfile
index 9d4a3b0..dec2bfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,6 @@ z-push-state-sql
 
 RUN mkdir /config
 ADD etc/z-push/* /etc/z-push/
-ADD etc/php.d/* /etc/php.d/
 
 ADD docker-entrypoint.sh /
 
diff --git a/etc/php.d/openshift-php-memlimit.ini b/etc/php.d/openshift-php-memlimit.ini
deleted file mode 100644
index 69b3887..0000000
--- a/etc/php.d/openshift-php-memlimit.ini
+++ /dev/null
@@ -1 +0,0 @@
-memory_limit = 512M
-- 
GitLab