From 81c53ee53d4246cc8470a1ca4776215b26305a79 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonc.jackson@gmail.com>
Date: Fri, 15 Mar 2024 10:49:08 -0400
Subject: [PATCH 1/3] merge silintl/ubuntu

---
 Dockerfile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7146d32..56e2baf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,13 @@
-FROM silintl/ubuntu:22.04
+FROM ubuntu:22.04
 LABEL maintainer="jason_jackson@sil.org"
 
-ENV REFRESHED_AT 2024-03-05
+ENV REFRESHED_AT 2024-03-15
 ENV HTTPD_PREFIX /etc/apache2
 ENV DEBIAN_FRONTEND noninteractive
 
+# Set up default locale environment variables
+ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
+
 # Install OS packages
 # Specific php versions are not required as ubuntu is feature complete
 RUN apt-get update && apt-get install -y \
@@ -12,6 +15,7 @@ RUN apt-get update && apt-get install -y \
     git \
     jq \
     libapache2-mod-php \
+    locales \
     nano \
     netcat \
     php \
@@ -33,9 +37,20 @@ RUN apt-get update && apt-get install -y \
     libssl3 \
     apache2 \
     && phpenmod mcrypt \
+    # Update the /etc/default/locale file
+    # removing locales causes issues
+    && locale-gen en_US.UTF-8 \
+    && update-locale LANG="$LANG" \
+    && update-locale LANGUAGE="$LANGUAGE" \
+    && update-locale LC_ALL="$LC_ALL" \
+    # Clean up to reduce docker image size
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# Install s3-expand into path
+RUN curl -o /usr/local/bin/s3-expand https://raw.githubusercontent.com/silinternational/s3-expand/master/expand.sh \
+    && chmod a+x /usr/local/bin/s3-expand
+
 # Install composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 

From 9ea24e2a293329fed36d46ab18ba0c8670d51664 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonc.jackson@gmail.com>
Date: Fri, 15 Mar 2024 11:34:55 -0400
Subject: [PATCH 2/3] use add instead of run curl

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56e2baf..89db15e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,16 +47,16 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Install s3-expand into path
-RUN curl -o /usr/local/bin/s3-expand https://raw.githubusercontent.com/silinternational/s3-expand/master/expand.sh \
-    && chmod a+x /usr/local/bin/s3-expand
-
 # Install composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
+# Install s3-expand
+ADD https://raw.githubusercontent.com/silinternational/s3-expand/master/expand.sh /usr/local/bin/s3-expand
+RUN chmod a+x /usr/local/bin/s3-expand
+
 # Install whenavail
-RUN curl -fo /usr/local/bin/whenavail https://raw.githubusercontent.com/silinternational/whenavail-script/1.0.2/whenavail \
-    && chmod a+x /usr/local/bin/whenavail
+ADD https://raw.githubusercontent.com/silinternational/whenavail-script/1.0.2/whenavail /usr/local/bin/whenavail
+RUN chmod a+x /usr/local/bin/whenavail
 
 # Remove default site, configs, and mods not needed
 WORKDIR $HTTPD_PREFIX

From 42f80a7ee608f6257a8b1d69e6cfe3cc14118c36 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonc.jackson@gmail.com>
Date: Fri, 15 Mar 2024 11:56:00 -0400
Subject: [PATCH 3/3] fix s3-expand

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 89db15e..9a2115a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y \
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 # Install s3-expand
-ADD https://raw.githubusercontent.com/silinternational/s3-expand/master/expand.sh /usr/local/bin/s3-expand
+ADD https://raw.githubusercontent.com/silinternational/s3-expand/master/s3-expand /usr/local/bin/s3-expand
 RUN chmod a+x /usr/local/bin/s3-expand
 
 # Install whenavail