moving nginx to olbase

docker-compose.production.yml

@@ -39,9 +39,8 @@ services:
 
   covers_nginx:
     profiles: ["ol-covers0"]
-    build:
-      context: .
-      dockerfile: docker/Dockerfile.nginx
+    image: "${OLIMAGE:-openlibrary/olbase:latest}"
+    command: nginx -g daemon off
     restart: always
     depends_on:
       - covers
@@ -117,9 +116,8 @@ services:
   web_nginx:
     restart: always
     hostname: "$HOSTNAME"
-    build:
-      context: .
-      dockerfile: docker/Dockerfile.nginx
+    image: "${OLIMAGE:-openlibrary/olbase:latest}"
+    command: nginx -g daemon off
     volumes:
       - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
       - ../olsystem/etc/nginx/sites-available/default-docker.conf:/etc/nginx/sites-enabled/default:ro
@@ -142,9 +140,8 @@ services:
 
   infobase_nginx:
     profiles: ["ol-home0"]
-    build:
-      context: .
-      dockerfile: docker/Dockerfile.nginx
+    image: "${OLIMAGE:-openlibrary/olbase:latest}"
+    command: nginx -g daemon off
     restart: always
     depends_on:
       - infobase

docker/Dockerfile.olbase

@@ -44,6 +44,19 @@ RUN apt-get -qq update && apt-get install -y build-essential libssl-dev zlib1g-d
     libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
 
+# Install Archive.org nginx w/ IP anonymization
+USER root
+RUN apt-get update && apt-get install -y --no-install-recommends nginx curl \
+    # nginx-plus
+    apt-transport-https lsb-release ca-certificates wget
+RUN wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -
+RUN echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" \
+    | tee /etc/apt/sources.list.d/openresty.list
+RUN apt-get update && apt-get -y install --no-install-recommends openresty
+RUN rm /usr/sbin/nginx
+RUN curl -L https://archive.org/download/nginx/nginx -o /usr/sbin/nginx
+RUN chmod +x /usr/sbin/nginx
+
 # Install latest pyenv (https://github.com/pyenv/pyenv-installer)
 USER openlibrary
 RUN curl https://pyenv.run | bash && \