Update V 1.11.4
This commit is contained in:
parent
49dd658019
commit
1a5682d815
|
|
@ -1,6 +1,6 @@
|
||||||
ARG MRBS_RELEASE=v1.11.1
|
FROM php:8.2.11-apache
|
||||||
|
|
||||||
FROM php:8.2.7-apache
|
ARG MRBS_RELEASE=v1.11.4
|
||||||
|
|
||||||
RUN a2enmod rewrite
|
RUN a2enmod rewrite
|
||||||
RUN a2enmod ssl
|
RUN a2enmod ssl
|
||||||
|
|
@ -27,6 +27,6 @@ RUN \
|
||||||
|
|
||||||
RUN docker-php-ext-install mysqli pdo pdo_mysql ldap intl gd
|
RUN docker-php-ext-install mysqli pdo pdo_mysql ldap intl gd
|
||||||
|
|
||||||
COPY themes/verdnatura /var/www/html/web/Themes
|
COPY themes/ /var/www/html/Themes
|
||||||
|
|
||||||
|
COPY config.inc.php /var/www/html/
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
ARG MRBS_RELEASE=v1.11.1
|
|
||||||
|
|
||||||
FROM php:8.2.7-apache
|
|
||||||
|
|
||||||
RUN a2enmod rewrite
|
|
||||||
RUN a2enmod ssl
|
|
||||||
RUN apt-get update && apt-get install libldap2-dev libicu-dev zlib1g-dev libpng-dev ldap-utils -y
|
|
||||||
RUN docker-php-ext-install mysqli
|
|
||||||
RUN apt-get update && apt-get install -y locales && \
|
|
||||||
sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen && \
|
|
||||||
sed -i 's/^# *\(en_GB.UTF-8\)/\1/' /etc/locale.gen && \
|
|
||||||
sed -i 's/^# *\(es_ES.UTF-8\)/\1/' /etc/locale.gen && \
|
|
||||||
locale-gen
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
echo "**** fetch mrbs ****" && \
|
|
||||||
rm -rf /var/www/html && \
|
|
||||||
mkdir -p /var/www/html && \
|
|
||||||
curl -o /tmp/mrbs.tar.gz -L \
|
|
||||||
"https://github.com/meeting-room-booking-system/mrbs-code/archive/${MRBS_RELEASE}.tar.gz" && \
|
|
||||||
echo "**** extract only folder 'web' ****" && \
|
|
||||||
tar -C /var/www/html --strip-components=2 -zxvf /tmp/mrbs.tar.gz $(tar --exclude="*/*" -tf /tmp/mrbs.tar.gz)web && \
|
|
||||||
mkdir -p /usr/share/mrbs && \
|
|
||||||
tar -C /usr/share/mrbs --wildcards --strip-components=1 -zxvf /tmp/mrbs.tar.gz $(tar --exclude="*/*" -tf /tmp/mrbs.tar.gz)tables.*.sql && \
|
|
||||||
echo "**** cleanup ****" && \
|
|
||||||
rm -rf /tmp/*
|
|
||||||
|
|
||||||
RUN docker-php-ext-install mysqli pdo pdo_mysql ldap intl gd
|
|
||||||
|
|
||||||
COPY themes/verdnatura /var/www/html/web/Themes
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,65 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$debug = false;
|
||||||
|
$timezone = "Europe/Madrid";
|
||||||
|
$mrbs_admin = "Your Administrator";
|
||||||
|
$mrbs_admin_email = "admin_email@your.org";
|
||||||
|
$mrbs_company_logo = "vernatura-logo.png";
|
||||||
|
$mrbs_company = "";
|
||||||
|
//$mrbs_company_url = "https://www.verdnatura.es/";
|
||||||
|
$weekstarts = 1;
|
||||||
|
|
||||||
|
/*******************
|
||||||
|
* Database settings
|
||||||
|
******************/
|
||||||
|
// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL
|
||||||
|
$dbsys = getenv('DB_TYPE') ? getenv('DB_TYPE') : "mysql";
|
||||||
|
// Hostname of database server. For pgsql, can use "" instead of localhost
|
||||||
|
// to use Unix Domain Sockets instead of TCP/IP. For mysql "localhost"
|
||||||
|
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
|
||||||
|
// if you want to force TCP connection you can use "127.0.0.1".
|
||||||
|
$db_host = getenv('DB_HOST');
|
||||||
|
// If you need to use a non standard port for the database connection you
|
||||||
|
// can uncomment the following line and specify the port number
|
||||||
|
// $db_port = 1234;
|
||||||
|
// Database name:
|
||||||
|
$db_database = getenv('DB_DATABASE');
|
||||||
|
// Schema name. This only applies to PostgreSQL and is only necessary if you have more
|
||||||
|
// than one schema in your database and also you are using the same MRBS table names in
|
||||||
|
// multiple schemas.
|
||||||
|
//$db_schema = "public";
|
||||||
|
// Database login user name:
|
||||||
|
$db_login = getenv('DB_USER');
|
||||||
|
// Database login password:
|
||||||
|
$db_password = getenv('DB_PASS');
|
||||||
|
// Prefix for table names. This will allow multiple installations where only
|
||||||
|
// one database is available
|
||||||
|
$db_tbl_prefix = "mrbs_";
|
||||||
|
// Set $db_persist to TRUE to use PHP persistent (pooled) database connections. Note
|
||||||
|
// that persistent connections are not recommended unless your system suffers significant
|
||||||
|
// performance problems without them. They can cause problems with transactions and
|
||||||
|
// locks (see http://php.net/manual/en/features.persistent-connections.php) and although
|
||||||
|
// MRBS tries to avoid those problems, it is generally better not to use persistent
|
||||||
|
// connections if you can.
|
||||||
|
$db_persist = false;
|
||||||
|
|
||||||
|
$theme = "verdnatura";
|
||||||
|
|
||||||
|
$auth["type"] = "ldap";
|
||||||
|
|
||||||
|
$ldap_host = "ldap://ldap.verdnatura.es";
|
||||||
|
$ldap_v3 = true;
|
||||||
|
$ldap_tls = false;
|
||||||
|
$ldap_base_dn = "dc=verdnatura,dc=es";
|
||||||
|
$ldap_user_attrib = "uid";
|
||||||
|
$ldap_dn_search_attrib = "uid";
|
||||||
|
$ldap_dn_search_dn = "cn=mrbs,ou=admins,dc=verdnatura,dc=es";
|
||||||
|
$ldap_get_user_email = false;
|
||||||
|
$ldap_email_attrib = 'mail';
|
||||||
|
$ldap_name_attrib = 'cn';
|
||||||
|
$ldap_admin_group_dn = 'cn=sysadmin,ou=dnGroups,dc=verdnatura,dc=es';
|
||||||
|
$ldap_group_member_attrib = 'memberof';
|
||||||
|
$ldap_debug = true;
|
||||||
|
$ldap_debug_attributes = true;
|
||||||
|
|
||||||
|
$auth['deny_public_access'] = true;
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
version: "2"
|
||||||
|
services:
|
||||||
|
mrbs:
|
||||||
|
image: registry.verdnatura.es/mrbs:1.11.4-modern
|
||||||
|
container_name: mrbs
|
||||||
|
environment:
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
- DB_HOST=mrbs-db
|
||||||
|
- DB_USER=mrbs-user
|
||||||
|
- DB_PASS=mrbs-pass
|
||||||
|
- DB_DATABASE=mrbs
|
||||||
|
volumes:
|
||||||
|
- ./config.inc.php:/var/www/html/config.inc.php
|
||||||
|
- ./dev/modern-mrbs-theme/modern:/var/www/html/Themes/modern
|
||||||
|
ports:
|
||||||
|
- 8888:80
|
||||||
|
depends_on:
|
||||||
|
- mrbs-db
|
||||||
|
mrbs-db:
|
||||||
|
image: docker.io/mariadb:latest
|
||||||
|
container_name: mrbs.db
|
||||||
|
environment:
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
- MYSQL_ROOT_PASSWORD=mrbs-root-pass
|
||||||
|
- TZ=Europe/Madrid
|
||||||
|
- MYSQL_DATABASE=mrbs
|
||||||
|
- MYSQL_USER=mrbs-user
|
||||||
|
- MYSQL_PASSWORD=mrbs-pass
|
||||||
|
volumes:
|
||||||
|
- ./mysql-data:/var/lib/mysql
|
||||||
|
ports:
|
||||||
|
- 3308:3306
|
||||||
|
|
||||||
Loading…
Reference in New Issue