Skip to content

Update 8.1 branch #7

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
briskt merged 3 commits into from
Feb 29, 2024
Merged

Update 8.1 branch #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de91e96
Merge pull request #4 from silinternational/develop
briskt Jan 9, 2024
4fe4530
add ServerName to apache2.conf to silence warning
briskt Feb 29, 2024
9adf865
Merge pull request #6 from silinternational/develop
briskt Feb 29, 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
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM silintl/ubuntu:22.04
LABEL maintainer="jason_jackson@sil.org"

ENV REFRESHED_AT 2022-05-23
ENV REFRESHED_AT 2024-02-29
ENV HTTPD_PREFIX /etc/apache2
ENV DEBIAN_FRONTEND noninteractive

Expand Down Expand Up @@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y \
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer

# Install whenavail
RUN curl -o /usr/local/bin/whenavail https://bitbucket.org/silintl/docker-whenavail/raw/1.0.2/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

# Remove default site, configs, and mods not needed
Expand All @@ -64,6 +64,8 @@ COPY conf/*.ini /etc/php/8.1/cli/conf.d/

COPY vhost.conf /etc/apache2/sites-enabled/

RUN echo "ServerName 127.0.0.1" >> /etc/apache2/apache2.conf

EXPOSE 80

# By default, simply start apache.
Expand Down