# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1709653425 -3600
# Node ID 31c84a32c897ea5ddc321a11e1d7f9aad0766989
# Parent  07439bc0ed3c6df3ae0fab204245317a50b82399
docker: modernisation and fixes:

- fix geckodriver version used following `backend-dev-e2e` base image update
- use Prosody image `prosodyim/prosody:0.12` instead of a deprecated one
- update `pubsub` image with base image update and use of new repos names

diff -r 07439bc0ed3c -r 31c84a32c897 docker/backend-dev-e2e/Dockerfile
--- a/docker/backend-dev-e2e/Dockerfile	Fri Feb 23 15:47:53 2024 +0100
+++ b/docker/backend-dev-e2e/Dockerfile	Tue Mar 05 16:43:45 2024 +0100
@@ -37,8 +37,8 @@
     # is own webdriver
     python -c 'from urllib.request import urlretrieve;\
     urlretrieve(\
-    "https://github.com/mozilla/geckodriver/releases/download/v0.28.0"\
-    "/geckodriver-v0.28.0-linux64.tar.gz", "/usr/local/bin/geckodriver.tar.gz")' && \
+    "https://github.com/mozilla/geckodriver/releases/download/v0.34.0"\
+    "/geckodriver-v0.34.0-linux64.tar.gz", "/usr/local/bin/geckodriver.tar.gz")' && \
     cd /usr/local/bin && tar zxf geckodriver.tar.gz && rm -f geckodriver.tar.gz
 
 WORKDIR /home/libervia
diff -r 07439bc0ed3c -r 31c84a32c897 docker/prosody-e2e/Dockerfile
--- a/docker/prosody-e2e/Dockerfile	Fri Feb 23 15:47:53 2024 +0100
+++ b/docker/prosody-e2e/Dockerfile	Tue Mar 05 16:43:45 2024 +0100
@@ -1,4 +1,4 @@
-FROM prosody/prosody
+FROM prosodyim/prosody:0.12
 
 LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"
 
diff -r 07439bc0ed3c -r 31c84a32c897 docker/pubsub/Dockerfile
--- a/docker/pubsub/Dockerfile	Fri Feb 23 15:47:53 2024 +0100
+++ b/docker/pubsub/Dockerfile	Tue Mar 05 16:43:45 2024 +0100
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"
 
@@ -6,10 +6,6 @@
 
 RUN apt-get update && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends locales python3-dev python3-venv python3-wheel mercurial libpq-dev gcc gnupg && \
-    # we install postgresql repository to have latest version
-    echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    python3 -c 'from urllib.request import urlopen; print(urlopen("https://www.postgresql.org/media/keys/ACCC4CF8.asc").read().decode())' | apt-key add - && \
-    # now we can install the client
     apt-get install -y --no-install-recommends postgresql-client && \
     # it's better to have a dedicated user
     useradd -m libervia && \
@@ -27,6 +23,6 @@
 RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && cd /src && \
     # we install thoses packages in editable mode, so we can replace them easily with volumes
     hg clone https://repos.goffi.org/sat_tmp && ~/libervia_env/bin/pip install -e sat_tmp && \
-    hg clone https://repos.goffi.org/sat_pubsub && ~/libervia_env/bin/pip install -e sat_pubsub
+    hg clone https://repos.goffi.org/libervia-pubsub && ~/libervia_env/bin/pip install -e libervia-pubsub
 
 ENTRYPOINT ["/home/libervia/entrypoint.sh"]
diff -r 07439bc0ed3c -r 31c84a32c897 docker/pubsub/entrypoint.sh
--- a/docker/pubsub/entrypoint.sh	Fri Feb 23 15:47:53 2024 +0100
+++ b/docker/pubsub/entrypoint.sh	Tue Mar 05 16:43:45 2024 +0100
@@ -11,7 +11,7 @@
 done
 
 ori_dir=${PWD}
-cd /src/sat_pubsub/db
+cd /src/libervia-pubsub/db
 
 # PG should be OK, we now initialize the database. If it's already done, it will fail
 # with exit code 3