summaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2020-07-13 10:05:26 -0700
committerGitHub <noreply@github.com>2020-07-13 10:05:26 -0700
commitc6592d385d17b89e6dd9dc244fb592d5ab38f28a (patch)
tree11383622b649dfcee41bff379380aa818371255c /lava-master/Dockerfile
parent5b77713b6290e44cbe34a426fea71f5881949f72 (diff)
parent8c9b84ce25577375d7c0c73229881d6e14a27ee8 (diff)
Merge pull request #122 from montjoie/postgres-fix
Postgres fix
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 5bf989a..6396253 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -39,6 +39,8 @@ COPY apache2/ /etc/apache2/
# Fixes 'postgresql ERROR: invalid locale name: "en_US.UTF-8"' when restoring a backup
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen en_US.UTF-8
+COPY pg_lava_password /root
+
# TODO: send this fix to upstream
RUN sed -i 's,find /root/entrypoint.d/ -type f,find /root/entrypoint.d/ -type f | sort,' /root/entrypoint.sh
# TODO: send this fix to upstream