Skip to content
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

Feature/update 8.3 #12

Merged
merged 7 commits into from
Sep 11, 2024
Merged

Feature/update 8.3 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73c5a4c
add config-shim 1.0.0
briskt Jul 18, 2024
f71a391
Merge pull request #10 from silinternational/config-shim
briskt Jul 22, 2024
6ad57d6
set the read bit on s3-expand and whenavail
briskt Jul 29, 2024
1e8e9fa
Merge pull request #11 from silinternational/whenavail-read-bit
briskt Jul 29, 2024
4a7d58e
set job timeout
briskt Sep 6, 2024
8c24bc8
Merge branch '8.1' into feature/update-8.3
jason-jackson Sep 11, 2024
b6efe17
change maintainer
jason-jackson Sep 11, 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
1 change: 1 addition & 0 deletions .github/workflows/build-and-publish.yml
View file
Open in desktop
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
View file
Open in desktop
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