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

merge bookmark @

Browse source
This commit is contained in:
Goffi 2021-11-12 17:21:24 +01:00
commit 14d00a9dda
28 changed files with 327 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker/backend-dev-demo/Dockerfile
View file

@ -16,7 +16,7 @@ USER libervia
RUN ./entrypoint.sh \
# we create the file sharing component which will autoconnect when backend is started
jp profile create file_sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file_sharing -A && \
jp profile create file-sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file-sharing -A && \
libervia-backend stop
RUN ./entrypoint.sh \

2
docker/backend-dev-demo/libervia.conf
View file

@ -4,7 +4,7 @@ email_server = libervia-backend.test
email_port = 8025
email_admins_list = admin@server1.test
[component file_sharing]
[component file-sharing]
http_upload_public_facing_url = http://localhost:7777
http_upload_connection_type = http
http_upload_port = 7777

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

@ -1,5 +1,5 @@
ARG REVISION=dev
FROM libervia/backend:${REVISION}
ARG REVISION
FROM libervia/backend:${REVISION:-dev}
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"
@ -58,7 +58,7 @@ RUN \
RUN ./entrypoint.sh \
# we create the file sharing component which will autoconnect when backend is started
li profile create file_sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file_sharing -A && \
li profile create file-sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file-sharing -A && \
libervia-backend stop
ENV LIBERVIA_TEST_REPORT_DIR=/reports

2
docker/backend-dev-e2e/libervia.conf
View file

@ -4,7 +4,7 @@ email_server = libervia-backend.test
email_port = 8025
email_admins_list = admin@server1.test
[component file_sharing]
[component file-sharing]
tls_certificate = /usr/share/libervia/certificates/server1.test.pem
tls_private_key = /usr/share/libervia/certificates/server1.test-key.pem
http_upload_public_facing_url = https://libervia-backend.test:8888

4
docker/backend-dev/Dockerfile
View file

@ -36,12 +36,12 @@ RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel &&
# local repos without it them cause troubles
hg clone https://repos.goffi.org/urwid-satext && ~/libervia_env/bin/pip install -e urwid-satext && \
mv urwid-satext/urwid_satext.egg-info ~/libervia_env/lib/python3.*/site-packages && \
hg clone https://repos.goffi.org/sat_tmp -u "${REVISION:-tip}" && ~/libervia_env/bin/pip install -e sat_tmp && \
hg clone https://repos.goffi.org/sat_tmp -u "${REVISION:-@}" && ~/libervia_env/bin/pip install -e sat_tmp && \
mv sat_tmp/sat_tmp.egg-info ~/libervia_env/lib/python3.*/site-packages && \
hg clone https://repos.goffi.org/libervia-templates && ~/libervia_env/bin/pip install -e libervia-templates && \
mv libervia-templates/libervia_templates.egg-info ~/libervia_env/lib/python3.*/site-packages && \
hg clone https://repos.goffi.org/libervia-media && \
hg clone https://repos.goffi.org/libervia-backend -u "${REVISION:-tip}" && ~/libervia_env/bin/pip install -e 'libervia-backend[SVG]' && \
hg clone https://repos.goffi.org/libervia-backend -u "${REVISION:-@}" && ~/libervia_env/bin/pip install -e 'libervia-backend[SVG]' && \
mv libervia-backend/libervia_backend.egg-info ~/libervia_env/lib/python3.*/site-packages && \
mkdir -p /home/libervia/.local/share/libervia

1
docker/docker-compose-e2e.yml
View file

@ -7,7 +7,6 @@ services:
depends_on:
# we need to depend on backend to get IP address of the container for conf
- backend
tmpfs: /var/lib/prosody
tmpfs: /var/log/prosody
networks:
default:

4
docker/libervia-web-dev-demo/Dockerfile
View file

@ -1,5 +1,5 @@
ARG REVISION=dev
FROM libervia/web:${REVISION}
ARG REVISION
FROM libervia/web:${REVISION:-dev}
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"

4
docker/libervia-web-dev-e2e/Dockerfile
View file

@ -1,5 +1,5 @@
ARG REVISION=dev
FROM libervia/web:${REVISION}
ARG REVISION
FROM libervia/web:${REVISION:-dev}
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"

2
docker/libervia-web-dev/Dockerfile
View file

@ -11,7 +11,7 @@ USER root
RUN apt-get install -y --no-install-recommends yarnpkg
WORKDIR /home/libervia
USER libervia
RUN cd /src && hg clone https://repos.goffi.org/libervia-web -u "${REVISION:-tip}" && \
RUN cd /src && hg clone https://repos.goffi.org/libervia-web -u "${REVISION:-@}" && \
~/libervia_env/bin/pip install -e libervia-web && \
mv libervia-web/libervia_web.egg-info ~/libervia_env/lib/python3.*/site-packages

4
docker/prosody-e2e/Dockerfile
View file

@ -16,7 +16,3 @@ COPY --chown=root:prosody prosody.cfg.lua /etc/prosody/prosody.cfg.lua
COPY --chown=root:tls-cert certificates/server1.test/cert.pem /usr/share/libervia/certificates/server1.test.pem
COPY --chown=root:tls-cert certificates/server1.test/key.pem /usr/share/libervia/certificates/server1.test-key.pem
# we add exec to handle properly signals, this is missing upstream
# FIXME: to be removed when new images are generated with
# https://github.com/prosody/prosody-docker/pull/65
RUN sed -i "s/^runuser -u prosody/exec \0/" /entrypoint.sh

15
docker/prosody-e2e/entrypoint.sh
View file

@ -1,15 +0,0 @@
#!/bin/bash
set -e
usermod -u "$(stat -c %u /var/lib/prosody/.)" prosody
if [[ "$1" != "prosody" ]]; then
exec prosodyctl "$@"
exit 0;
fi
if [ "$LOCAL" -a "$PASSWORD" -a "$DOMAIN" ] ; then
prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD"
fi
exec runuser -u prosody -- "$@"

4
docker/web-demo.yml
View file

@ -6,8 +6,8 @@ services:
depends_on:
# we need to depend on backend to get IP address of the container for conf
- backend
tmpfs: /var/lib/prosody
tmpfs: /var/log/prosody
tmpfs:
- /var/log/prosody
networks:
default:
aliases: