From a7ad1fa57a9d1ff9f80751592cbb06733e694b0f Mon Sep 17 00:00:00 2001
From: La sif serveur <david.beniamine@tetras-libre.fr>
Date: Fri, 22 Jul 2022 00:02:40 +0200
Subject: [PATCH] Add TZ
---
.env.sample | 1 +
docker-compose.yml | 2 ++
docker/Dockerfile | 1 +
traefik.yml | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.env.sample b/.env.sample
index 5178e59..54d5e7a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,3 +7,4 @@ DB_PASSWORD=INSERT_RANDOM_PASSWORD_HERE
DB_DATABASE=wordpress
DEBUG=0
DB_PREFIX=wp_
+TZ=Europe/Paris
diff --git a/docker-compose.yml b/docker-compose.yml
index 067ddab..aea259b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
build: docker/
restart: always
environment:
+ TZ: ${TZ}
WORDPRESS_DB_HOST: db
WORDPRESS_DB_USER: ${DB_USERNAME}
WORDPRESS_DB_PASSWORD: ${DB_PASSWORD}
@@ -27,6 +28,7 @@ services:
image: mariadb
restart: always
environment:
+ TZ: ${TZ}
MYSQL_DATABASE: ${DB_DATABASE}
MYSQL_USER: ${DB_USERNAME}
MYSQL_PASSWORD: ${DB_PASSWORD}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe4825e..fb30257 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,6 +2,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
+RUN sed -i 's@\(</VirtualHost>\)@Alias /bulletins-specif /var/www/bulletins-specif\n\1@' /etc/apache2/sites-available/000-default.conf
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
diff --git a/traefik.yml b/traefik.yml
index 4d0c31f..5b8d6aa 100644
--- a/traefik.yml
+++ b/traefik.yml
@@ -6,7 +6,7 @@ services:
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
- - "traefik.http.routers.${NAME}.rule=Host(`${HOST}`)"
+ - "traefik.http.routers.${NAME}.rule=Host(${HOSTS})"
- "traefik.http.routers.${NAME}.tls.certresolver=myresolver"
- "traefik.http.routers.${NAME}.entrypoints=web,websecure"
- "traefik.http.services.${NAME}.loadbalancer.server.port=80"
--
GitLab