From 73c5a4c478dd0b90c7b507f6969a915fe95ded6f Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Thu, 18 Jul 2024 12:30:13 -0600 Subject: [PATCH 1/4] add config-shim 1.0.0 --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9a2115a..0c58884 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,6 +81,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. From 6ad57d6f6348f86b50435d210a4408eced3bddf2 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:35:39 +0800 Subject: [PATCH 2/4] set the read bit on s3-expand and whenavail --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c58884..3565e97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,11 +52,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 From 4a7d58ef8546da6f94c0e8ad863f261d4838d47c Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:13:15 +0800 Subject: [PATCH 3/4] set job timeout --- .github/workflows/build-and-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index edaa3cf..90f86fe 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -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 From b6efe17975831593730731bf8e725248695f8857 Mon Sep 17 00:00:00 2001 From: Jason Jackson Date: Wed, 11 Sep 2024 11:47:44 -0400 Subject: [PATCH 4/4] change maintainer --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab2cc73..51307b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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