Skip to content

merge silintl/ubuntu #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jason-jackson merged 3 commits into from
Mar 15, 2024
Merged

merge silintl/ubuntu #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81c53ee
merge silintl/ubuntu
jason-jackson Mar 15, 2024
9ea24e2
use add instead of run curl
jason-jackson Mar 15, 2024
42f80a7
fix s3-expand
jason-jackson Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
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"
Copy link
Contributor Author

@jason-jackson jason-jackson Mar 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I defined these earlier than silintl/ubuntu did, so that I could use them when setting up locale. I don't think this would cause issues, but wanted to draw attention to it if you think it does.


# Install OS packages
# Specific php versions are not required as ubuntu is feature complete
RUN apt-get update && apt-get install -y \
curl \
git \
jq \
libapache2-mod-php \
locales \
nano \
netcat \
php \
Expand All @@ -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
Expand Down