framadate ma gueule

dockers/framadate/Dockerfile

@@ -6,11 +6,11 @@ FROM php:7.4-apache
 COPY .dummy .apt-mirror-confi[g] .proxy-confi[g] /
 RUN cp /.proxy-config /etc/profile.d/proxy.sh 2> /dev/null || true
 RUN if [ -f /.apt-mirror-config ] ; then . /.apt-mirror-config && sed -i \
-    -e "s/deb.debian.org/${APT_MIRROR_DEBIAN}/g" \
-    -e "s/security.debian.org/${APT_MIRROR_DEBIAN_SECURITY}/g" \
-    -e "s/archive.ubuntu.com/${APT_MIRROR_UBUNTU}/g" \
-    -e "s/security.ubuntu.com/${APT_MIRROR_UBUNTU_SECURITY}/g" \
-    /etc/apt/sources.list; fi
+	-e "s%s\?://deb.debian.org%://${APT_MIRROR_DEBIAN}%g" \
+	-e "s%s\?://security.debian.org%://${APT_MIRROR_DEBIAN_SECURITY}%g" \
+	-e "s%s\?://archive.ubuntu.com%://${APT_MIRROR_UBUNTU}%g" \
+	-e "s%s\?://security.ubuntu.com%://${APT_MIRROR_UBUNTU_SECURITY}%g" \
+	/etc/apt/sources.list; fi
 
 ########################################
 RUN apt-get update --quiet && apt-get install -y \

dockers/framadate/build.sh

@@ -4,19 +4,6 @@ KAZ_ROOT=$(cd $(dirname $0)/../..; pwd)
 . "${KAZ_ROOT}/bin/.commonFunctions.sh"
 setKazVars
 
-SRC_FRAMADATE="https://github.com/framasoft/framadate.git"
-FRAMDATE_VER="1.1.19"
-
 printKazMsg "\n  *** Création du Dockerfile Framadate"
-
-printKazMsg "\n  - GIT Framadate "
-cd "${KAZ_GIT_DIR}"
-if [ ! -d "framadate" ]; then
-    git clone "${SRC_FRAMADATE}"
-fi
-
-cd "${KAZ_GIT_DIR}/framadate" && git reset --hard && git checkout ${FRAMADATE_VER}
-
-printKazMsg "\n  - Dockefile"
 cd "${KAZ_ROOT}"
 docker build -t datekaz . -f dockers/framadate/Dockerfile

dockers/framadate/docker-compose.yml

@@ -3,14 +3,13 @@ version: '3.3'
 services:
 
   framadate:
+    # ports:
+    #   - 8088:80
     image: datekaz
-    build: .
     container_name: ${framadateServName}
     restart: ${restartPolicy}
     depends_on:
       - db
-    # ports:
-    #   - 8085:80
     networks:
       - framadateNet
       - postfixNet

dockers/framadate/first.sh

@@ -11,10 +11,7 @@ cd $(dirname $0)
 
 FRAMADATE_URL="${httpProto}://${dateHost}.${domain}"
 
-if ! [[ "$(docker ps -f name=${framadateServName} | grep -w ${framadateServName})" ]]; then
-    printKazError "Framadate not running... abort"
-    exit
-fi
+checkDockerRunning "${framadateServName}" "Framadate" || exit
 
 if [ ! -f "${DOCK_LIB}/volumes/framadate_dateConfig/_data/config.php" ]; then
     printKazMsg "\n  *** Premier lancement de Framadate"