[discourse-web/flathub] Don't install postgres 11
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [discourse-web/flathub] Don't install postgres 11
- Date: Wed, 7 Oct 2020 11:17:58 +0000 (UTC)
commit dffad5a447502c1d8ea0d541c565c6ee66d956da
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Wed Oct 7 12:46:00 2020 +0200
Don't install postgres 11
Dockerfile | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index f06f674..fbaf6da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,19 +4,13 @@ FROM discourse/base:2.0.20200724-1815
LABEL maintainer="Discourse Administrators <discourse-admins cern ch>" \
io.openshift.expose-services="8080,3000,6379:http"
-ENV PG_MAJOR 11
ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1
ENV RAILS_ENV production
+ENV DEBIAN_FRONTEND noninteractive
-### Install prerequisites #############################
-# Install PG_11 for CERN
-# n.b.: https://github.com/discourse/discourse_docker/commit/82e4d76f8bb93a3517a71ebb0c710307101476be
-RUN DEBIAN_FRONTEND=noninteractive apt-get purge -y postgresql-12 postgresql-client-12 postgresql-contrib-12
&& \
- apt -y update && \
- apt -y install postgresql-${PG_MAJOR} postgresql-client-${PG_MAJOR} \
- postgresql-contrib-${PG_MAJOR} \
- # Use gettext for envsubst
- gettext
+# Use gettext for envsubst
+RUN apt-get update && \
+ apt-get install -y gettext
RUN apt clean
### Configure Nginx
@@ -112,4 +106,4 @@ RUN chmod +x ./run-discourse.sh ./run-nginx.sh ./run-redis.sh ./init-dbmigration
chmod +x /discourse/config/unicorn_launcher
### entrypoint will be overriden for init-containers
-ENTRYPOINT ["./run-discourse.sh"]
\ No newline at end of file
+ENTRYPOINT ["./run-discourse.sh"]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]