From 0f06d26ee113a466b0e8d6c997a429734452a8a1 Mon Sep 17 00:00:00 2001
From: Dariusz Janny <janny@man.poznan.pl>
Date: Fri, 29 Jan 2021 08:46:28 +0100
Subject: [PATCH] [edugain/faas#30] updating orm library for PHP 7.x
---
Dockerfile | 6 ++++--
conf/etc/registry/application/composer.json | 16 ++++++++++++++++
.../registry/{ => application/config}/config.php | 0
.../{ => application/config}/database.php | 0
4 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 conf/etc/registry/application/composer.json
rename conf/etc/registry/{ => application/config}/config.php (100%)
rename conf/etc/registry/{ => application/config}/database.php (100%)
diff --git a/Dockerfile b/Dockerfile
index 25dc0ce..164a1cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,12 +26,14 @@ RUN cd /opt/rr3 && bash install.sh && \
cp email-default.php email.php && \
cp memcached-default.php memcached.php
-COPY ./conf/etc/registry/config.php /opt/rr3/application/config/config.php
-COPY ./conf/etc/registry/database.php /opt/rr3/application/config/database.php
+COPY ./conf/etc/registry/application/config/config.php /opt/rr3/application/config/config.php
+COPY ./conf/etc/registry/application/config/database.php /opt/rr3/application/config/database.php
+COPY ./conf/etc/registry/application/composer.json /opt/rr3/application/composer.json
RUN cp /opt/codeigniter/index.php /opt/rr3/index.php && \
sed -i 's#$system_path = \x27system\x27;#$system_path = \x27/opt/codeigniter/system\x27;#' /opt/rr3/index.php && \
cd /opt/rr3/application && \
+ composer update && \
composer install
EXPOSE 80
diff --git a/conf/etc/registry/application/composer.json b/conf/etc/registry/application/composer.json
new file mode 100644
index 0000000..7cbed0a
--- /dev/null
+++ b/conf/etc/registry/application/composer.json
@@ -0,0 +1,16 @@
+{
+ "name": "edugate/resourceregistry",
+ "description": "Federation(s) (SAML) management",
+ "license": "MIT",
+ "require": {
+ "doctrine/orm": "2.5.*",
+ "zendframework/zend-permissions-acl": "^2.6",
+ "mtdowling/cron-expression": "1.1.*",
+ "phpseclib/phpseclib": "2.0.*",
+ "lcobucci/jwt": "3.2.*",
+ "php-amqplib/php-amqplib": "2.6.*"
+ },
+ "require-dev": {
+ "phpmd/phpmd": "^2.6"
+ }
+}
diff --git a/conf/etc/registry/config.php b/conf/etc/registry/application/config/config.php
similarity index 100%
rename from conf/etc/registry/config.php
rename to conf/etc/registry/application/config/config.php
diff --git a/conf/etc/registry/database.php b/conf/etc/registry/application/config/database.php
similarity index 100%
rename from conf/etc/registry/database.php
rename to conf/etc/registry/application/config/database.php
--
GitLab