From 5064d01dc72d58116174ca4607b56201a68c3ff9 Mon Sep 17 00:00:00 2001 From: La sif serveur <david.beniamine@tetras-libre.fr> Date: Thu, 21 Jul 2022 16:42:05 +0200 Subject: [PATCH] Add custom build for ldap + rsyslog --- .gitignore | 1 - docker-compose.yml | 3 ++- docker/Dockerfile | 7 +++++++ docker/entrypoint.sh | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) delete mode 100644 .gitignore create mode 100644 docker/Dockerfile create mode 100644 docker/entrypoint.sh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4c49bd7..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env diff --git a/docker-compose.yml b/docker-compose.yml index 25cef9d..067ddab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.0" services: wordpress: - image: wordpress + build: docker/ restart: always environment: WORDPRESS_DB_HOST: db @@ -21,6 +21,7 @@ services: define('FS_CHMOD_FILE',0664); volumes: - "${WP_PATH}:/var/www/html/" + - "./log:/var/log" db: image: mariadb diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..fe4825e --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,7 @@ +FROM wordpress:php7.4 +RUN apt-get update && apt-get install -y libldap2-dev rsyslog +#RUN docker-php-ext-install ldap +RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && docker-php-ext-install ldap +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100644 index 0000000..d1d50c2 --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/bash +/etc/init.d/rsyslog start +mkdir -p /var/log/apache2 +chown -R 33:33 /var/log/apache2 +apache2ctl -DFOREGROUND -- GitLab