From 161cb9cfbc874351319698f1141edb27dcb07fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dni=20=E2=9A=A1?= <office@dnilabs.com>
Date: Thu, 9 Mar 2023 13:48:44 +0100
Subject: [PATCH 1/3] remove build not needed, create the right datadir, add
 postgres-client for pg_dump backup functionality

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b4e22c7..43663b95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,19 +2,19 @@ FROM python:3.10-slim
 
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install -y curl pkg-config build-essential
+RUN apt-get install -y curl pkg-config build-essential postgresql-client
 RUN curl -sSL https://install.python-poetry.org | python3 -
 
 ENV PATH="/root/.local/bin:$PATH"
 
 WORKDIR /app
-RUN mkdir -p lnbits/data
 
 COPY . .
 
+RUN mkdir data
+
 RUN poetry config virtualenvs.create false
 RUN poetry install --only main
-RUN poetry run python tools/build.py
 
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"

From a8f534cd2ea6de10f5b3e9cda5dfec4dc2157ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dni=20=E2=9A=A1?= <office@dnilabs.com>
Date: Thu, 9 Mar 2023 15:10:50 +0100
Subject: [PATCH 2/3] postgres-client version 14...

---
 Dockerfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 43663b95..539b652c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,18 @@ FROM python:3.10-slim
 
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install -y curl pkg-config build-essential postgresql-client
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN apt-get install -y curl pkg-config build-essential
 
+RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
 
+# needed for backups postgresql-client version 14 (pg_dump)
+RUN apt-get install wget
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN apt-get update
+RUN apt-get install postgresql-client-14
+
 WORKDIR /app
 
 COPY . .

From 3fa4135a12d53e286e36a394af8f87c9482af795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dni=20=E2=9A=A1?= <office@dnilabs.com>
Date: Thu, 9 Mar 2023 16:01:52 +0100
Subject: [PATCH 3/3] non interactive install

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 539b652c..c042f33b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,11 +8,11 @@ RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
 
 # needed for backups postgresql-client version 14 (pg_dump)
-RUN apt-get install wget
+RUN apt-get install -y wget
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 RUN apt-get update
-RUN apt-get install postgresql-client-14
+RUN apt-get install -y postgresql-client-14
 
 WORKDIR /app