Skip to content

Commit

Permalink
Merge pull request #12 from silinternational/feature/update-8.3
Browse files Browse the repository at this point in the history
Feature/update 8.3
  • Loading branch information
jason-jackson authored Sep 11, 2024
2 parents 0eccd28 + b6efe17 commit 611f587
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
build-and-publish:
name: Build and Publish
runs-on: ubuntu-latest
timeout-minutes: ${{ fromJSON(vars.DEFAULT_JOB_TIMEOUT_MINUTES) }}
steps:
- uses: actions/checkout@v4
- name: Log in to Docker Hub
Expand Down
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:24.04
LABEL maintainer="jason_jackson@sil.org"
LABEL maintainer="gtis_itse_support@sil.org"

ENV REFRESHED_AT 2024-04-26
ENV REFRESHED_AT 2024-09-11
ENV HTTPD_PREFIX /etc/apache2
ENV DEBIAN_FRONTEND noninteractive

Expand Down Expand Up @@ -53,11 +53,11 @@ 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
RUN chmod a+rx /usr/local/bin/s3-expand

# Install 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
RUN chmod a+rx /usr/local/bin/whenavail

# Remove default site, configs, and mods not needed
WORKDIR $HTTPD_PREFIX
Expand All @@ -82,6 +82,9 @@ COPY vhost.conf /etc/apache2/sites-enabled/

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

ADD https://github.com/silinternational/config-shim/releases/download/v1.0.0/config-shim.gz config-shim.gz
RUN gzip -d config-shim.gz && chmod 755 config-shim && mv config-shim /usr/local/bin

EXPOSE 80

# By default, simply start apache.
Expand Down

0 comments on commit 611f587

Please sign in to comment.