Commit 9174833c authored by roxane's avatar roxane
Browse files

Merge branch 'castopod'

parents 370f36b3 5dd71974
FROM alpine:3.13 AS downloader
ARG VERSION=v1.0.0-alpha.53
ARG VERSION=v1.0.0-alpha.57
RUN apk add --no-cache curl jq && \
curl -L $(curl https://code.podlibre.org/api/v4/projects/2/releases/${VERSION}/assets/links | jq -r .[].url | grep \.tar\.gz) -o castopod.tgz && \
......@@ -21,7 +21,7 @@ RUN apk add --no-cache libpng icu-libs freetype libwebp libjpeg-turbo libxpm &&
docker-php-ext-enable mysqli gd intl && \
apk del .php-ext-build-dep
COPY --from=downloader /castopod /castopod
COPY --from=downloader /castopod-host /castopod
RUN chmod 544 /entrypoint.sh && \
chmod 444 /crontab.txt && \
......
......@@ -16,7 +16,7 @@ networks:
services:
app-back:
image: registry.picasoft.net/pica-castopod-back:v2.0.0-alpha.53
image: registry.picasoft.net/pica-castopod-back:v2.0.0-alpha.57
build: back
container_name: "castopod-back"
volumes:
......@@ -28,7 +28,7 @@ services:
restart: unless-stopped
app-front:
image: registry.picasoft.net/pica-castopod-front:v1.0.0-alpha.53
image: registry.picasoft.net/pica-castopod-front:v1.0.0-alpha.57
build: front
container_name: "castopod-front"
networks:
......
FROM alpine:3.13 AS downloader
ARG VERSION=v1.0.0-alpha.53
ARG VERSION=v1.0.0-alpha.57
RUN apk add --no-cache curl jq && \
curl -L $(curl https://code.podlibre.org/api/v4/projects/2/releases/${VERSION}/assets/links | jq -r .[].url | grep \.tar\.gz) -o castopod.tgz && \
......@@ -18,4 +18,4 @@ HEALTHCHECK --interval=30s --timeout=3s CMD curl --fail http://localhost || exit
COPY nginx.conf /etc/nginx/nginx.conf
COPY --from=downloader /castopod/public /var/www/html
COPY --from=downloader /castopod-host/public /var/www/html
......@@ -84,5 +84,38 @@
"Folder": "privatebin",
"Cron": "0 */6 * * *",
"Init-Backup": "1"
},
"castopod": {
"Host": "castopod-db",
"Port": "5432",
"User": "CASTOPOD_DB_USER",
"Password": "CASTOPOD_DB_PASSWORD",
"Database": "castopod",
"Type": "mysql",
"Folder": "castopod",
"Cron": "0 */6 * * *",
"Init-Backup": "1"
},
"peertube": {
"Host": "peertube-db",
"Port": "5432",
"User": "PEERTUBE_DB_USER",
"Password": "PEERTUBE_DB_PASSWORD",
"Database": "peertube",
"Type": "postgres",
"Folder": "peertube",
"Cron": "0 */6 * * *",
"Init-Backup": "1"
},
"lufi": {
"Host": "lufi-db",
"Port": "5432",
"User": "LUFI_DB_USER",
"Password": "LUFI_DB_PASSWORD",
"Database": "lufi",
"Type": "postgres",
"Folder": "lufi",
"Cron": "0 */6 * * *",
"Init-Backup": "1"
}
}
......@@ -17,6 +17,12 @@ networks:
name: "mattermost"
privatebin:
name: "privatebin"
castopod:
name: "castopod-db"
peertube:
name: "peertube"
lufi:
name: "lufi"
services:
db-backup:
......
......@@ -12,3 +12,9 @@ CODIMD_DB_USER=
CODIMD_DB_PASSWORD=
PRIVATEBIN_DB_USER=
PRIVATEBIN_DB_PASSWORD=
CASTOPOD_DB_USER=
CASTOPOD_DB_PASSWORD=
PEERTUBE_DB_USER=
PEERTUBE_DB_PASSWORD=
LUFI_DB_USER=
LUFI_DB_PASSWORD=
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment