From 0575d42214fbde9a17def2d913e7580205ea7193 Mon Sep 17 00:00:00 2001 From: Anup Jambhekar Date: Wed, 11 Sep 2024 02:29:04 +0530 Subject: [PATCH 1/5] changed the docker sed command --- web/v2.6.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/v2.6.3/Dockerfile b/web/v2.6.3/Dockerfile index 4fee18a..11e3359 100644 --- a/web/v2.6.3/Dockerfile +++ b/web/v2.6.3/Dockerfile @@ -33,7 +33,7 @@ RUN gem install foreman COPY install-nginx.sh /tmp/install-nginx.sh RUN /tmp/install-nginx.sh && \ cp config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf && \ - sed -i "s/^ server_name enter\.your\.web\.hostname\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ + sed -i "s/^ server_name enter\\.your\\.web\\.hostname\\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ mkdir -p /var/nginx/cache/ # Install Redis From 0b00db24e4463c62eec228670c434aede6ed1610 Mon Sep 17 00:00:00 2001 From: Anup Date: Wed, 11 Sep 2024 02:55:21 +0530 Subject: [PATCH 2/5] Update Dockerfile (#1) --- web/v2.6.3/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/v2.6.3/Dockerfile b/web/v2.6.3/Dockerfile index 11e3359..4a0c80d 100644 --- a/web/v2.6.3/Dockerfile +++ b/web/v2.6.3/Dockerfile @@ -33,6 +33,7 @@ RUN gem install foreman COPY install-nginx.sh /tmp/install-nginx.sh RUN /tmp/install-nginx.sh && \ cp config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf && \ + echo "DISCOURSE_HOSTNAME is: $DISCOURSE_HOSTNAME" sed -i "s/^ server_name enter\\.your\\.web\\.hostname\\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ mkdir -p /var/nginx/cache/ From c5e68158f5a123b8d3e4f7ca99568c6409088b91 Mon Sep 17 00:00:00 2001 From: Anup Jambhekar Date: Wed, 11 Sep 2024 02:59:14 +0530 Subject: [PATCH 3/5] fixed sed error --- web/v2.6.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/v2.6.3/Dockerfile b/web/v2.6.3/Dockerfile index 4a0c80d..0a35c4e 100644 --- a/web/v2.6.3/Dockerfile +++ b/web/v2.6.3/Dockerfile @@ -33,7 +33,7 @@ RUN gem install foreman COPY install-nginx.sh /tmp/install-nginx.sh RUN /tmp/install-nginx.sh && \ cp config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf && \ - echo "DISCOURSE_HOSTNAME is: $DISCOURSE_HOSTNAME" + echo "DISCOURSE_HOSTNAME is: $DISCOURSE_HOSTNAME" && \ sed -i "s/^ server_name enter\\.your\\.web\\.hostname\\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ mkdir -p /var/nginx/cache/ From 57230b37caedb30c1dd3b36337c56f3121d16e6d Mon Sep 17 00:00:00 2001 From: Anup Jambhekar Date: Wed, 11 Sep 2024 03:16:21 +0530 Subject: [PATCH 4/5] added hostname check --- web/v2.6.3/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/v2.6.3/Dockerfile b/web/v2.6.3/Dockerfile index 0a35c4e..74a4a47 100644 --- a/web/v2.6.3/Dockerfile +++ b/web/v2.6.3/Dockerfile @@ -12,6 +12,8 @@ ENV DISCOURSE_WORKER_CONCURRENCY=${DISCOURSE_WORKER_CONCURRENCY:-2} WORKDIR $DISCOURSE_ROOT +RUN echo "DISCOURSE_HOSTNAME is: $DISCOURSE_HOSTNAME" + RUN git clone https://github.com/discourse/discourse.git --branch $DISCOURSE_VERSION --single-branch $DISCOURSE_ROOT RUN apt-get update && apt-get install -y \ @@ -33,7 +35,6 @@ RUN gem install foreman COPY install-nginx.sh /tmp/install-nginx.sh RUN /tmp/install-nginx.sh && \ cp config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf && \ - echo "DISCOURSE_HOSTNAME is: $DISCOURSE_HOSTNAME" && \ sed -i "s/^ server_name enter\\.your\\.web\\.hostname\\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ mkdir -p /var/nginx/cache/ From fbd04de7115eee1b41aea15573a6090f7e99ea64 Mon Sep 17 00:00:00 2001 From: Anup Jambhekar Date: Wed, 11 Sep 2024 03:30:45 +0530 Subject: [PATCH 5/5] fixed ld error --- web/v2.6.3/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/v2.6.3/Dockerfile b/web/v2.6.3/Dockerfile index 74a4a47..0201d38 100644 --- a/web/v2.6.3/Dockerfile +++ b/web/v2.6.3/Dockerfile @@ -18,6 +18,7 @@ RUN git clone https://github.com/discourse/discourse.git --branch $DISCOURSE_VER RUN apt-get update && apt-get install -y \ brotli \ + libbrotli-dev \ gifsicle \ jhead \ jpegoptim \ @@ -33,7 +34,8 @@ RUN gem install foreman # Configure NGINX COPY install-nginx.sh /tmp/install-nginx.sh -RUN /tmp/install-nginx.sh && \ +RUN ldconfig && \ + /tmp/install-nginx.sh && \ cp config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf && \ sed -i "s/^ server_name enter\\.your\\.web\\.hostname\\.here;/ server_name $DISCOURSE_HOSTNAME;/" /etc/nginx/conf.d/discourse.conf && \ mkdir -p /var/nginx/cache/