Alpine 3.22.0 (Apache 2.4.63-r4)

also add apache2-http2 and apache2-brotli

Dockerfile

@@ -1,11 +1,11 @@
-FROM harbor.ntppool.org/perlorg/base-os:3.14.2
+FROM harbor.ntppool.org/perlorg/base-os:3.22.0
 ENV BUILD_VERSION 1
 USER root
 WORKDIR /web
 VOLUME /git
 VOLUME /web/config
 RUN apk --no-cache upgrade
-RUN apk --no-cache add apache2 apache2-utils apache2-proxy apache2-ssl apr-util-dbd_sqlite3 sqlite
+RUN apk --no-cache add apache2 apache2-utils apache2-proxy apache2-http2 apache2-brotli apache2-ssl apr-util-dbd_sqlite3 sqlite
 #RUN mkdir /run/apache2; chown apache:apache /run/apache2
 RUN mv /etc/apache2/conf.d/proxy.conf /etc/apache2/conf.d/proxy.conf.disabled
 RUN ln -s /dev/stderr /var/log/apache2/error.log

README.md

@@ -2,12 +2,12 @@
 
 ## Test locally
 
-    docker build -t quay.io/perl/static-web:v1.2.0 .
+    docker build -t static-web:1 .
     git clone git@git.develooper.com:perl-static-misc.git git
 
     docker run -p 8000:80 --name static-misc \
        -v `pwd`/git:/git/static -v `pwd`/config:/web/config \
-       -ti --rm quay.io/perl/static-web:v1.2.0
+       -ti --rm static-web:1
 
 Test with
 
@@ -21,12 +21,6 @@ And then run `curl -H 'Host: i.perl.org' localhost` there.
 
 ## Production image
 
-The "production image" is in https://quay.io/perl/static-web - the image
+The "production image" is at harbor.ntppool.org/library/static-web:latest
-is "manually" built and pushed because I didn't want to give quay access
+(or rather tagged with the most recent version, for example 2.2.0)
-to all of this git repository.
-
-  REV=v1.0
-  IMAGE=quay.io/perl/static-web:$REV
-  docker build -t $IMAGE . && \
-  docker push $IMAGE
 

run-httpd

@@ -4,7 +4,7 @@ set -ex
 if [ ! -z "$READY_FILE" ]; then
     while [ ! -e $READY_FILE ]; do
         echo waiting for $READY_FILE
-        sleep 10
+        sleep 5
     done
 fi