From 621178d871a6ccc922a41620e8a21c962882f174 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 10:55:29 +0200 Subject: [PATCH 1/6] dd --- docker-compose/baserow/config.yml.j2 | 8 ++++++++ docker-compose/baserow/docker-compose.yml.j2 | 15 +++++++++++++++ host_vars/docker10.mgrote.net.yml | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 docker-compose/baserow/config.yml.j2 create mode 100644 docker-compose/baserow/docker-compose.yml.j2 diff --git a/docker-compose/baserow/config.yml.j2 b/docker-compose/baserow/config.yml.j2 new file mode 100644 index 00000000..f4ce8c03 --- /dev/null +++ b/docker-compose/baserow/config.yml.j2 @@ -0,0 +1,8 @@ +--- +container: + valid_volumes: + - /docker/wiki/site +log: + level: info +runner: + capacity: 4 diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2 new file mode 100644 index 00000000..549f689b --- /dev/null +++ b/docker-compose/baserow/docker-compose.yml.j2 @@ -0,0 +1,15 @@ +--- +# https://baserow.io/docs/installation%2Finstall-with-docker-compose +services: + baserow: + container_name: baserow + image: baserow/baserow:1.27.2 + environment: + BASEROW_PUBLIC_URL: 'http://docker10.mgrote.net' # todo + ports: + - "80:80" + - "443:443" + volumes: + - baserow_data:/baserow/data +volumes: + baserow_data: diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 0574b358..02d596c5 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -66,6 +66,8 @@ compose_files: state: present - name: act-runner state: present + - name: baserow + state: present ### oefenweb.ufw ufw_rules: -- 2.43.0 From f4959fb97a1617105b5e5fae361ad51e09c99d92 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 10:55:39 +0200 Subject: [PATCH 2/6] dd --- docker-compose/baserow/config.yml.j2 | 8 -------- docker-compose/baserow/docker-compose.yml.j2 | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 docker-compose/baserow/config.yml.j2 diff --git a/docker-compose/baserow/config.yml.j2 b/docker-compose/baserow/config.yml.j2 deleted file mode 100644 index f4ce8c03..00000000 --- a/docker-compose/baserow/config.yml.j2 +++ /dev/null @@ -1,8 +0,0 @@ ---- -container: - valid_volumes: - - /docker/wiki/site -log: - level: info -runner: - capacity: 4 diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2 index 549f689b..7574db00 100644 --- a/docker-compose/baserow/docker-compose.yml.j2 +++ b/docker-compose/baserow/docker-compose.yml.j2 @@ -13,3 +13,6 @@ services: - baserow_data:/baserow/data volumes: baserow_data: + + +# traefik -- 2.43.0 From 77111c12552c633cfb6a6efafef3460cbe0ae61c Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 10:59:00 +0200 Subject: [PATCH 3/6] dd --- docker-compose/baserow/docker-compose.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2 index 7574db00..c98993db 100644 --- a/docker-compose/baserow/docker-compose.yml.j2 +++ b/docker-compose/baserow/docker-compose.yml.j2 @@ -7,8 +7,8 @@ services: environment: BASEROW_PUBLIC_URL: 'http://docker10.mgrote.net' # todo ports: - - "80:80" - - "443:443" + - "280:80" + - "2443:443" volumes: - baserow_data:/baserow/data volumes: -- 2.43.0 From 815577f52a5a90d8913ee07d2f7fb3f0acdf7c77 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 11:00:12 +0200 Subject: [PATCH 4/6] dd --- docker-compose/miniflux/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/miniflux/docker-compose.yml.j2 b/docker-compose/miniflux/docker-compose.yml.j2 index 0086cd86..0cfa9cb1 100644 --- a/docker-compose/miniflux/docker-compose.yml.j2 +++ b/docker-compose/miniflux/docker-compose.yml.j2 @@ -32,7 +32,7 @@ services: ######## Postgres ######## mf-db17: - container_name: "mf-db17" + container_name: "mf-db" image: "postgres:17.0" restart: always environment: -- 2.43.0 From 6a23ab928ad32df66715abf7c12a101cca45f48b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 12:04:11 +0200 Subject: [PATCH 5/6] dd --- docker-compose/baserow/.env | 3 +++ docker-compose/baserow/docker-compose.yml.j2 | 1 + 2 files changed, 4 insertions(+) create mode 100644 docker-compose/baserow/.env diff --git a/docker-compose/baserow/.env b/docker-compose/baserow/.env new file mode 100644 index 00000000..ea1f7086 --- /dev/null +++ b/docker-compose/baserow/.env @@ -0,0 +1,3 @@ +SECRET_KEY: hallowelt +DATABASE_PASSWORD: hallowelt +REDIS_PASSWORD: hallowelt diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2 index c98993db..a0953454 100644 --- a/docker-compose/baserow/docker-compose.yml.j2 +++ b/docker-compose/baserow/docker-compose.yml.j2 @@ -16,3 +16,4 @@ volumes: # traefik +# ldap -- 2.43.0 From 65b9c2bef5c0bb5a4349c600a35faec56ff865f8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 2 Oct 2024 12:06:16 +0200 Subject: [PATCH 6/6] dd --- docker-compose/baserow/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/baserow/docker-compose.yml.j2 b/docker-compose/baserow/docker-compose.yml.j2 index a0953454..00b0b967 100644 --- a/docker-compose/baserow/docker-compose.yml.j2 +++ b/docker-compose/baserow/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: container_name: baserow image: baserow/baserow:1.27.2 environment: - BASEROW_PUBLIC_URL: 'http://docker10.mgrote.net' # todo + BASEROW_PUBLIC_URL: 'http://docker10.mgrote.net:280' # todo ports: - "280:80" - "2443:443" -- 2.43.0