Undo secrets changes

Author: ldionne

.github/workflows/build-docker.yaml

@@ -33,5 +33,4 @@ jobs:
         push: ${{ startsWith(github.ref, 'refs/tags/') }} # only push to ghcr.io on tags
         tags: ghcr.io/${{github.repository}}:latest
         file: docker/lnt.dockerfile
-        target: llvm-lnt
         context: . # use the current directory as context, as checked out by actions/checkout -- needed for setuptools_scm

docker/compose.yaml

@@ -13,22 +13,20 @@
 #     The authentication token used to require authentication to
 #     perform destructive actions.
 
-name: llvm-lnt-prod
+name: llvm-lnt
 
 services:
   webserver:
     container_name: webserver
     build:
       context: ../
       dockerfile: docker/lnt.dockerfile
-      target: llvm-lnt-prod
       args:
         DB_USER: lntuser
         DB_HOST: dbserver
         DB_NAME: lnt.db
-    secrets:
-      - lnt-db-password
-      - lnt-auth-token
+        DB_PASSWORD: ${LNT_DB_PASSWORD}
+        AUTH_TOKEN: ${LNT_AUTH_TOKEN}
     depends_on:
       - db
     deploy:
@@ -44,21 +42,13 @@ services:
     container_name: dbserver
     image: docker.io/postgres:18-alpine
     environment:
-      - POSTGRES_PASSWORD_FILE=/run/secrets/lnt-db-password
+      - POSTGRES_PASSWORD=${LNT_DB_PASSWORD}
       - POSTGRES_USER=lntuser
       - POSTGRES_DB=lnt.db
-    secrets:
-      - lnt-db-password
     volumes:
       - database:/var/lib/postgresql
 
 volumes:
   instance:
   logs:
   database:
-
-secrets:
-  lnt-db-password:
-    environment: "LNT_DB_PASSWORD"
-  lnt-auth-token:
-    environment: "LNT_AUTH_TOKEN"

docker/docker-entrypoint.sh

@@ -2,18 +2,6 @@
 
 set -u
 
-if [ ! -f /run/secrets/lnt-db-password ]; then
-    echo "Missing secret lnt-db-password"
-    exit 1
-fi
-DB_PASSWORD="$(cat /run/secrets/lnt-db-password)"
-
-if [ ! -f /run/secrets/lnt-auth-token ]; then
-    echo "Missing secret lnt-auth-token"
-    exit 1
-fi
-AUTH_TOKEN="$(cat /run/secrets/lnt-auth-token)"
-
 DB_PATH="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}"
 
 # Set up the instance the first time this gets run.

docker/lnt.dockerfile

@@ -1,12 +1,6 @@
-# This Dockerfile defines a basic 'llvm-lnt' image that contains an installed
-# copy of LNT. That image can be built and run with:
-#
-#   $ docker build --file docker/lnt.dockerfile --target llvm-lnt .
-#   $ docker run -it <sha> /bin/sh
-#
-# It also defines a 'llvm-lnt-prod' image which is set up to run a production
-# LNT server. This image is intended to be built from a Docker Compose file,
-# as it requires additional information like secrets and build arguments:
+# This Dockerfile defines an image that contains a production LNT server.
+# This image is intended to be built from a Docker Compose file, as it
+# requires additional information passed as build arguments:
 #
 #   ARG DB_USER
 #     The username to use for logging into the database.
@@ -17,14 +11,14 @@
 #   ARG DB_NAME
 #     The name of the database on the server.
 #
-#   secret: lnt-db-password
+#   ARG DB_PASSWORD
 #     The password to use for logging into the database.
 #
-#   secret: lnt-auth-token
-#     The authentication token used to require authentication to
-#     perform destructive actions.
+#   ARG AUTH_TOKEN
+#     The authentication token used to require authentication
+#     to perform destructive actions.
 
-FROM python:3.10-alpine AS llvm-lnt
+FROM python:3.10-alpine
 
 # Install dependencies
 RUN apk update \
@@ -38,17 +32,16 @@ RUN --mount=type=bind,source=.,target=./lnt-source \
     pip3 install -r requirements.server.txt && apk --purge del .build-deps && \
     rm -rf /tmp/lnt-src
 
-
-FROM llvm-lnt AS llvm-lnt-prod
-
 # Prepare volumes that will be used by the server
 VOLUME /var/lib/lnt /var/log/lnt
 
 # Set up the actual entrypoint that gets run when the container starts.
 COPY docker/docker-entrypoint.sh docker/lnt-wait-db /usr/local/bin/
-ARG DB_USER DB_HOST DB_NAME
+ARG DB_USER DB_HOST DB_NAME DB_PASSWORD AUTH_TOKEN
 ENV DB_USER=${DB_USER}
 ENV DB_HOST=${DB_HOST}
 ENV DB_NAME=${DB_NAME}
+ENV DB_PASSWORD=${DB_PASSWORD}
+ENV AUTH_TOKEN=${AUTH_TOKEN}
 ENTRYPOINT ["docker-entrypoint.sh"]
 EXPOSE 8000