diff --git a/Dockerfile b/Dockerfile index 7146d32..9a2115a 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,15 +37,26 @@ 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 composer COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer +# Install 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 -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