diff options
author | Alex Auvolat <alex@adnab.me> | 2022-08-24 15:42:47 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2022-08-24 15:42:47 +0200 |
commit | 2e8923b383eb06c53261eee8e5c442b857fb67e4 (patch) | |
tree | 0ad148f75f7b54dfed2dbac8f43f6df9badc502a /app/im/build | |
parent | 9848f3090f77363a2fda0f9fa673ebcf1fb8228c (diff) | |
download | nixcfg-2e8923b383eb06c53261eee8e5c442b857fb67e4.tar.gz nixcfg-2e8923b383eb06c53261eee8e5c442b857fb67e4.zip |
Move app files into cluster subdirectories; add prod garage
Diffstat (limited to 'app/im/build')
-rw-r--r-- | app/im/build/matrix-synapse/Dockerfile | 54 | ||||
-rwxr-xr-x | app/im/build/matrix-synapse/entrypoint.sh | 3 | ||||
-rwxr-xr-x | app/im/build/matrix-synapse/matrix-s3-async | 16 | ||||
-rwxr-xr-x | app/im/build/matrix-synapse/matrix-s3-async-sqlite | 13 |
4 files changed, 0 insertions, 86 deletions
diff --git a/app/im/build/matrix-synapse/Dockerfile b/app/im/build/matrix-synapse/Dockerfile deleted file mode 100644 index 0496b19..0000000 --- a/app/im/build/matrix-synapse/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -FROM amd64/debian:buster as builder - -ARG VERSION -ARG S3_VERSION -RUN apt-get update && \ - apt-get -qq -y full-upgrade && \ - apt-get install -y \ - python3 \ - python3-pip \ - python3-dev \ - python3-setuptools \ - libffi-dev \ - build-essential \ - libssl-dev \ - libjpeg-dev \ - libjpeg62-turbo-dev \ - libxml2-dev \ - zlib1g-dev \ - # postgresql-dev \ - libpq-dev \ - virtualenv \ - libxslt1-dev \ - git - -RUN virtualenv /root/matrix-env -p /usr/bin/python3 -RUN . /root/matrix-env/bin/activate && \ - pip3 install \ - https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview] && \ - pip3 install \ - git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} - -FROM amd64/debian:buster - -RUN apt-get update && \ - apt-get -qq -y full-upgrade && \ - apt-get install -y \ - python3 \ - python3-distutils \ - libffi6 \ - libjpeg62-turbo \ - libssl1.1 \ - libxslt1.1 \ - libpq5 \ - zlib1g \ - libjemalloc2 \ - ca-certificates - -ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 -COPY --from=builder /root/matrix-env /root/matrix-env -COPY matrix-s3-async /usr/local/bin/matrix-s3-async -COPY matrix-s3-async-sqlite /usr/local/bin/matrix-s3-async-sqlite -COPY entrypoint.sh /usr/local/bin/entrypoint - -ENTRYPOINT ["/usr/local/bin/entrypoint"] diff --git a/app/im/build/matrix-synapse/entrypoint.sh b/app/im/build/matrix-synapse/entrypoint.sh deleted file mode 100755 index b93a702..0000000 --- a/app/im/build/matrix-synapse/entrypoint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. /root/matrix-env/bin/activate -exec "$@" diff --git a/app/im/build/matrix-synapse/matrix-s3-async b/app/im/build/matrix-synapse/matrix-s3-async deleted file mode 100755 index e435144..0000000 --- a/app/im/build/matrix-synapse/matrix-s3-async +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -cat > database.yaml <<EOF -user: $PG_USER -password: $PG_PASS -database: $PG_DB -host: $PG_HOST -port: $PG_PORT -EOF - -while true; do - /root/matrix-env/bin/s3_media_upload update-db 0d - /root/matrix-env/bin/s3_media_upload --no-progress check-deleted /var/lib/matrix-synapse/media - /root/matrix-env/bin/s3_media_upload --no-progress upload /var/lib/matrix-synapse/media matrix --delete --endpoint-url https://garage.deuxfleurs.fr - sleep 600 -done diff --git a/app/im/build/matrix-synapse/matrix-s3-async-sqlite b/app/im/build/matrix-synapse/matrix-s3-async-sqlite deleted file mode 100755 index 4bba072..0000000 --- a/app/im/build/matrix-synapse/matrix-s3-async-sqlite +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -cat > database.yaml <<EOF -sqlite: - database: $SYNAPSE_SQLITE_DB -EOF - -while true; do - /root/matrix-env/bin/s3_media_upload update-db 0d - /root/matrix-env/bin/s3_media_upload --no-progress check-deleted $SYNAPSE_MEDIA_STORE - /root/matrix-env/bin/s3_media_upload --no-progress upload $SYNAPSE_MEDIA_STORE $SYNAPSE_MEDIA_S3_BUCKET --delete --endpoint-url $S3_ENDPOINT - sleep 600 -done |