From 5d361d2e63965400b6cc008111d9b29ec9f1712b Mon Sep 17 00:00:00 2001 From: Adrian Schlatter <10478149+adrianschlatter@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:01:35 +0100 Subject: [PATCH 1/3] docker-compose => docker compose --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f67bf0..f6e8461 100644 --- a/Makefile +++ b/Makefile @@ -8,5 +8,5 @@ up: webref-$(VERSION).tar.gz VERSION=$(VERSION) docker compose up --detach clean: - VERSION=$(VERSION) docker-compose down --rmi all --volumes --remove-orphans + VERSION=$(VERSION) docker compose down --rmi all --volumes --remove-orphans rm -f webref-$(VERSION).tar.gz From 83e133e76a90ebee7ae24b69bd0f9d74eeed008e Mon Sep 17 00:00:00 2001 From: Adrian Schlatter <10478149+adrianschlatter@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:08:09 +0100 Subject: [PATCH 2/3] network_mode: bridge Without this line in the docker-compose.yml file, docker creates a separate network for this container that apparently has no working gateway. At least, sqlalchemy then fails to connect to the sql server running on the host. --- docker-compose_templ.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose_templ.yml b/docker-compose_templ.yml index 6328096..21e3065 100644 --- a/docker-compose_templ.yml +++ b/docker-compose_templ.yml @@ -3,6 +3,7 @@ services: image: webref:${VERSION} ports: - "7000:8080" + network_mode: bridge volumes: - :/usr/local/lib/python3.11/site-packages/ppf/webref/references secrets: From 1d8940886a14c5d5c9d354c9574d8b9efd2ec93d Mon Sep 17 00:00:00 2001 From: Adrian Schlatter <10478149+adrianschlatter@users.noreply.github.com> Date: Sun, 8 Mar 2026 18:53:25 +0100 Subject: [PATCH 3/3] dockerize ppf.webref==0.2.0 --- Dockerfile | 2 +- Makefile | 2 +- docs/README.md | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 830cefd..9bedbe3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN chown -R webref:webref . # install web app and wsgi server: USER root RUN pip install --no-cache-dir -r requirements.txt -RUN pip install --no-cache ppf.webref==0.1.1 +RUN pip install --no-cache ppf.webref==0.2.0 # run wsgi server: USER webref diff --git a/Makefile b/Makefile index f6e8461..6cc51b5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := 0.1 +VERSION := 0.2.0 webref-$(VERSION).tar.gz: Dockerfile config/requirements.txt Makefile docker build -t webref:$(VERSION) . diff --git a/docs/README.md b/docs/README.md index 329bc19..6d9b885 100644 --- a/docs/README.md +++ b/docs/README.md @@ -111,4 +111,5 @@ everyone to adhere to it, just make sure you do as well. # Changelog -* 0.1: Dockerizes `ppf.webref-0.1.1`. +* 0.2.0: Dockerizes `ppf.webref-0.2.0` +* 0.1: Dockerizes `ppf.webref-0.1.1`.