Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker image
name: Build LNT Docker image

on:
- push
Expand Down
6 changes: 2 additions & 4 deletions docker/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# of a container running a Postgres database and a container running a
# production LNT webserver.
#
# In order to build the full service, some secrets are required. They are taken
# In order to compose the full service, some secrets are required. They are taken
# as environment variables, which means they can be stored in a file and included
# via `--env-file <secrets-file>`. These environment variables are:
#
Expand All @@ -18,9 +18,7 @@ name: llvm-lnt
services:
webserver:
container_name: webserver
build:
context: ../
dockerfile: docker/lnt.dockerfile
image: ghcr.io/llvm/llvm-lnt:latest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally don't use docker for local development so am fine if it no longer builds the local image. But did you find a way to parameterise it at all?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I searched for ways to do that and didn't find anything satisfactory, unfortunately. For local development, I think it's fine to just use lnt runserver .

environment:
- DB_USER=lntuser
- DB_HOST=dbserver
Expand Down
12 changes: 10 additions & 2 deletions docker/lnt.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 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 environment variables:
# It requires additional information passed as environment variables:
#
# DB_USER
# The username to use for logging into the database.
Expand All @@ -17,6 +16,15 @@
# AUTH_TOKEN_FILE
# File containing the authentication token used to require authentication
# to perform destructive actions.
#
# It also stores information in the following volumes:
#
# /var/lib/lnt
# The actual LNT instance data (schema files, configuration files, etc).
#
# /var/log/lnt
# Log files for the instance.
#

FROM python:3.10-alpine

Expand Down