Merge branch 'discourse:main' into parse-cpu-count-only-one-line

Author: Gullumluvl

image/base/Dockerfile

@@ -29,10 +29,12 @@ RUN sh -c "fping proxy && echo 'Acquire { Retries \"0\"; HTTP { Proxy \"http://p
 RUN apt-mark hold initscripts
 RUN apt-get -y upgrade
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y locales locales-all
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y locales
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
+RUN sed -i "s/^# $LANG/$LANG/" /etc/locale.gen; \
+    locale-gen
 
 RUN install -d /usr/share/postgresql-common/pgdg &&\
     curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc &&\
@@ -66,7 +68,6 @@ RUN cd / &&\
     mkdir -p /etc/runit/1.d &&\
     apt-get clean &&\
     rm -f /etc/apt/apt.conf.d/40proxy &&\
-    locale-gen en_US &&\
     DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs yarn &&\
     npm install -g terser uglify-js pnpm
 

templates/postgres.13.template.yml

@@ -17,7 +17,8 @@ hooks:
        to: sv start postgres || exit 1
 
 run:
-  - exec: locale-gen $LANG && update-locale
+  - exec: sed -i "s/^# $LANG/$LANG/" /etc/locale.gen
+  - exec: locale-gen && update-locale
   - exec: mkdir -p /shared/postgres_run
   - exec: chown postgres:postgres /shared/postgres_run
   - exec: chmod 775 /shared/postgres_run

templates/postgres.15.template.yml

@@ -52,7 +52,8 @@ run:
       chmod: "+x"
       contents: |
         #!/bin/bash
-        locale-gen $LANG && update-locale
+        sed -i "s/^# $LANG/$LANG/" /etc/locale.gen
+        locale-gen && update-locale
         mkdir -p /shared/postgres_run
         chown postgres:postgres /shared/postgres_run
         chmod 775 /shared/postgres_run

templates/postgres.template.yml

@@ -50,7 +50,8 @@ run:
       chmod: "+x"
       contents: |
         #!/bin/bash
-        locale-gen $LANG && update-locale
+        sed -i "s/^# $LANG/$LANG/" /etc/locale.gen
+        locale-gen && update-locale
         mkdir -p /shared/postgres_run
         chown postgres:postgres /shared/postgres_run
         chmod 775 /shared/postgres_run

templates/web.ssl.template.yml

@@ -15,14 +15,16 @@ run:
      filename: "/etc/nginx/conf.d/discourse.conf"
      from: /listen 80;\s+gzip on;/m
      to: |
-       listen 443 ssl http2;
+       listen 443 ssl;
+       http2 on;
        SSL_TEMPLATE_SSL_BLOCK
   - replace:
      filename: "/etc/nginx/conf.d/discourse.conf"
      from: /listen 80;\s+listen \[::\]:80;\s+gzip on;/m
      to: |
-       listen 443 ssl http2;
-       listen [::]:443 ssl http2;
+       listen 443 ssl;
+       listen [::]:443 ssl;
+       http2 on;
        SSL_TEMPLATE_SSL_BLOCK
   - replace:
      hook: ssl