erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker: modernisation and fixes:

Browse source 
- 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
This commit is contained in:
Goffi 2024-03-05 16:43:45 +01:00
commit d50ca26d12
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker/backend-dev-e2e/Dockerfile
View file

@ -37,8 +37,8 @@ RUN \
# is own webdriver # is own webdriver
python -c 'from urllib.request import urlretrieve;\ python -c 'from urllib.request import urlretrieve;\
urlretrieve(\ urlretrieve(\
"https://github.com/mozilla/geckodriver/releases/download/v0.28.0"\ "https://github.com/mozilla/geckodriver/releases/download/v0.34.0"\
"/geckodriver-v0.28.0-linux64.tar.gz", "/usr/local/bin/geckodriver.tar.gz")' && \ "/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 cd /usr/local/bin && tar zxf geckodriver.tar.gz && rm -f geckodriver.tar.gz
WORKDIR /home/libervia WORKDIR /home/libervia

2
docker/prosody-e2e/Dockerfile
View file

@ -1,4 +1,4 @@
FROM prosody/prosody FROM prosodyim/prosody:0.12
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>" LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"

8
docker/pubsub/Dockerfile
View file

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>" LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"
@ -6,10 +6,6 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get upgrade -y && \ 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 && \ 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 && \ apt-get install -y --no-install-recommends postgresql-client && \
# it's better to have a dedicated user # it's better to have a dedicated user
useradd -m libervia && \ useradd -m libervia && \
@ -27,6 +23,6 @@ USER libervia
RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && cd /src && \ 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 # 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_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"] ENTRYPOINT ["/home/libervia/entrypoint.sh"]

2
docker/pubsub/entrypoint.sh
View file

@ -11,7 +11,7 @@ until psql -c "select 1" > /dev/null 2>&1 || [ $RETRIES -eq 0 ]; do
done done
ori_dir=${PWD} 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 # PG should be OK, we now initialize the database. If it's already done, it will fail
# with exit code 3 # with exit code 3