Remove the option to use a custom base image for the www container

ICTU · Jul 4, 2024 · f5107ea · f5107ea
1 parent f9468f8
commit f5107ea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/components/proxy/Dockerfile b/components/proxy/Dockerfile
@@ -1,6 +1,11 @@
-ARG IMAGE_NAME=nginxinc/nginx-unprivileged
-ARG IMAGE_VERSION=1.27.0-alpine3.19-slim
-FROM $IMAGE_NAME:$IMAGE_VERSION
+FROM nginxinc/nginx-unprivileged:1.27.0-alpine3.19-slim as compile-image
+
+# hadolint ignore=DL3002
+USER root
+# Add the CAP_NET_BIND_SERVICE to provide backwards compatability, running on privileged port (80)
+RUN apk add --no-cache libcap=2.69-r1 && setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/nginx
+
+FROM nginxinc/nginx-unprivileged:1.27.0-alpine3.19-slim
 
 LABEL maintainer="Quality-time team <quality-time@ictu.nl>"
 LABEL description="Quality-time proxy"
@@ -11,4 +16,5 @@ ENV FRONTEND_PORT 5000
 ENV API_SERVER_HOST api_server
 ENV API_SERVER_PORT 5001
 
+COPY --from=compile-image /usr/sbin/nginx /usr/sbin/nginx
 COPY *.template /etc/nginx/templates/
diff --git a/docs/src/changelog.md b/docs/src/changelog.md
@@ -48,6 +48,10 @@ If your currently installed *Quality-time* version is not v5.13.0, please first
 - Remove the share tabs for reports, subjects, and metrics and move the share button to the button row in the report, subject, and metric headers. Closes [#8821](https://github.com/ICTU/quality-time/issues/8821).
 - Set the MongoDB feature compatibility version to v7. Closes [#8896](https://github.com/ICTU/quality-time/issues/8896).
 
+### Removed
+
+- Remove the option to use a custom base image for the `www` container. Updates [#8857](https://github.com/ICTU/quality-time/issues/8857).
+
 ## v5.13.0 - 2024-05-23
 
 ### Deployment notes

diff --git a/docs/src/deployment.md b/docs/src/deployment.md
@@ -194,19 +194,6 @@ The collector, notifier, and API-server all have log level `WARNING` as default.
 
 The proxy access log is turned off. Please submit an issue if you need this and possibly other logging settings to be configurable.
 
-## Using a custom base image for the `www` container (optional)
-
-The base image of the `www` container can be configured as follows in the [compose file](https://github.com/ICTU/quality-time/blob/master/docker/docker-compose.yml):
-
-```yaml
-  www:
-    build:
-      context: ../components/proxy
-      args:
-        IMAGE_NAME: nginx
-        IMAGE_VERSION: stable-perl
-```
-
 ## Moving *Quality-time*
 
 The easiest way to move a *Quality-time* instance is to deploy a new *Quality-time* instance at the new location and then copy the database contents from the old instance to the new instance. All *Quality-time* data is contained in the Mongo database, so that is the only data that needs to be copied.