diff options
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rwxr-xr-x | util/docker-init.sh | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -FROM ubuntu:rolling +FROM ubuntu:bionic MAINTAINER Yoran Heling <contact@vndb.org> RUN apt-get update @@ -6,7 +6,7 @@ RUN apt-get update RUN apt-get install -y locales && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install -y tzdata && apt-get install -y --no-install-recommends \ build-essential \ cpanminus \ git \ diff --git a/util/docker-init.sh b/util/docker-init.sh index 9cf07d32..d4e0e65c 100755 --- a/util/docker-init.sh +++ b/util/docker-init.sh @@ -34,9 +34,9 @@ mkdevuser() { pg_start() { - echo 'local all postgres peer' >/etc/postgresql/9.6/main/pg_hba.conf - echo 'local all all md5' >>/etc/postgresql/9.6/main/pg_hba.conf - # I'm glad Ubuntu 17.10 still has an init script for this + echo 'local all postgres peer' >/etc/postgresql/10/main/pg_hba.conf + echo 'local all all md5' >>/etc/postgresql/10/main/pg_hba.conf + # I'm glad Ubuntu 18.04 still has an init script for this /etc/init.d/postgresql start } |