mirror of
https://github.com/ClusterCockpit/cc-docker.git
synced 2024-11-10 08:57:25 +01:00
Merge branch 'main' of https://github.com/ClusterCockpit/cc-docker into main
This commit is contained in:
commit
e52b1978f3
2
.env
2
.env
@ -3,7 +3,7 @@ DATADIR=./data
|
||||
########################################################################
|
||||
# APP
|
||||
########################################################################
|
||||
APP_CLUSTERCOCKPIT_INIT=false
|
||||
APP_CLUSTERCOCKPIT_INIT=true
|
||||
APP_ENVIRONMENT=dev
|
||||
|
||||
########################################################################
|
||||
|
@ -6,6 +6,8 @@ It creates containers for:
|
||||
* mysql
|
||||
* php-fpm
|
||||
* nginx
|
||||
* redis
|
||||
* openldap
|
||||
* influxdb (only in dev mode)
|
||||
* phpmyadmin (only in dev mode), this did not work with Chrome for me.
|
||||
|
||||
|
1027
data/ldap/users.ldif
Normal file
1027
data/ldap/users.ldif
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -30,6 +30,19 @@ RUN cp /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/co
|
||||
RUN cp /etc/php8/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
|
||||
COPY error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
|
||||
|
||||
# Enable php8-xdebug if $PHP_XDEBUG_MODE is not empty
|
||||
ARG PHP_XDEBUG_MODE=off
|
||||
ARG PHP_XDEBUG_CLIENT_PORT=5902
|
||||
ARG PHP_XDEBUG_CLIENT_HOST=host.docker.internal
|
||||
COPY xdebug.ini /etc/php8/conf.d/xdebug.ini.template
|
||||
RUN if [[ "$PHP_XDEBUG_MODE" != "" ]]; then \
|
||||
export PHP_XDEBUG_MODE=$PHP_XDEBUG_MODE; \
|
||||
export PHP_XDEBUG_CLIENT_PORT=$PHP_XDEBUG_CLIENT_PORT; \
|
||||
export PHP_XDEBUG_CLIENT_HOST=$PHP_XDEBUG_CLIENT_HOST; \
|
||||
envsubst < /etc/php8/conf.d/xdebug.ini.template > /etc/php8/conf.d/xdebug.ini; \
|
||||
fi
|
||||
RUN rm -f /etc/php8/conf.d/xdebug.ini.template
|
||||
|
||||
RUN curl -sS https://getcomposer.org/installer | tee composer-setup.php \
|
||||
&& php composer-setup.php && rm composer-setup.php* \
|
||||
&& chmod +x composer.phar && mv composer.phar /usr/bin/composer
|
||||
|
Loading…
Reference in New Issue
Block a user