From f9e7903a4afd27a99f526bfc9da06101e080aaca Mon Sep 17 00:00:00 2001
From: root <root@debian.hopital.local>
Date: Thu, 6 Aug 2020 18:24:28 +0200
Subject: [PATCH] =?UTF-8?q?Suppression=20des=20doublons=20passage=20=C3=A0?=
 =?UTF-8?q?=20mariadb=20au=20lieu=20de=20mysql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml    | 2 +-
 service/apache2/run   | 2 --
 service/cron/run      | 6 ------
 service/glpi_init/run | 3 ---
 4 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100755 service/apache2/run
 delete mode 100755 service/cron/run
 delete mode 100755 service/glpi_init/run

diff --git a/docker-compose.yml b/docker-compose.yml
index ffd67f9..917a90c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - db
 
   db:
-    image: mysql:5.7
+    image: mariadb
     container_name: glpi-db
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: always
diff --git a/service/apache2/run b/service/apache2/run
deleted file mode 100755
index eed6d08..0000000
--- a/service/apache2/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec apache2-foreground
diff --git a/service/cron/run b/service/cron/run
deleted file mode 100755
index 890e6c2..0000000
--- a/service/cron/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue. See  https://github.com/phusion/baseimage-docker/issues/198
-touch -c /etc/crontab /etc/cron.*/* /var/spool/cron/crontabs/*
-
-exec /usr/sbin/cron -f
diff --git a/service/glpi_init/run b/service/glpi_init/run
deleted file mode 100755
index 1627eb8..0000000
--- a/service/glpi_init/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/root/glpi_init.sh
-sleep infinity