le sidaner · Benjamin Renard
Showing 4 changed files Show diff stats
conf/.env
conf/dachs-dockerfile
conf/docker-compose.yml
conf/docker-entrypoint.sh
 # enter here all key = value you need to path in docker-compose.yaml file
-VERSION=11
+VERSION=12
+# PostgreSQL version to build containers
+PG_VERSION=15
+
 ###########GITHUB PATH :as the repository is set in gitlab
 GITREPO_INSTITUTION=omp
@@ -11,6 +11,7 @@ ARG APACHE_PORT
 ARG SERVERNAME
 ARG DOMAIN
 ARG PROTOCOL
+ARG PG_VERSION
@@ -22,15 +23,26 @@ RUN apt-get install -y curl apt-utils
 RUN curl -o /etc/apt/trusted.gpg.d/gavo-archive.key.asc https://docs.g-vo.org/archive-key.asc
 RUN echo "deb http://vo.ari.uni-heidelberg.de/debian release main" > /etc/apt/sources.list.d/dachs.list
+# Some fixes on the environment
+# ---
+# This is the brute-force solution for Debian;
+# I am having problems in set locales non-interactively,
+# and since I really need the "C/UTF8" for postgres, will just set it for all.
+ENV LC_ALL=C.UTF-8
+RUN echo LC_ALL="$LC_ALL" > /etc/default/locale
+
+RUN sed -i 's/exit 101/exit 0/' /usr/sbin/policy-rc.d
+
 ###
 # Server Configuration
 ###
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get install -y postgresql-13 postgresql-13-q3c postgresql-13-pgsphere 
+RUN apt-get install -y postgresql postgresql-$PG_VERSION-q3c postgresql-$PG_VERSION-pgsphere 
 RUN apt-get install -y git wget awstats net-tools vim libgeo-ipfree-perl
 RUN service postgresql restart && apt-get install -y gavodachs2-server
 RUN apt-get install -y openssh-server openssh-client apache2 w3m 
+RUN sed -i 's/exit 101/exit 0/' /usr/sbin/policy-rc.d
 #copy the configuration files into the docker
@@ -4,8 +4,9 @@ services:
   dachs:
     container_name: ${CONTAINER_NAME}
     image: ${CONTAINER_NAME}
-
     tty: true
+
+
     expose:
       - "${DACHS_PORT}"
       - "${APACHE_PORT}"
@@ -19,6 +20,7 @@ services:
       dockerfile: dachs-dockerfile
       args:   
         - "VERSION=${VERSION}"
+        - "PG_VERSION=${PG_VERSION}"
         - "GITREPO_SERVER=${GITREPO_SERVER}"        
         - "GITREPO_INSTITUTION=${GITREPO_INSTITUTION}"
         - "DACHS_PORT=${DACHS_PORT}"
@@ -3,7 +3,7 @@
 # script executé au démarrage du docker
 service ssh restart
 service postgresql restart
-dachs serve start
+service dachs start
 chown -R dachsroot:gavo /var/gavo/logs
 chown -R root:gavo /var/gavo/logs/server.stderr
@@ -33,3 +33,5 @@ if ([ ! -f &quot;/home/dachsroot/.ssh/know_hosts&quot; ] &amp;&amp; [ -f &quot;/run/secrets/id_rsa&quot; ]);
     chown dachsroot:gavo /home/dachsroot/.ssh/known_hosts
     chmod 600 /home/dachsroot/.ssh/known_hosts
 fi
+
+dachs serve start -f