master
Paul Walko 2024-06-01 08:52:01 -04:00
parent 00e6f43866
commit 79589c344a
8 changed files with 63 additions and 71 deletions

View File

@ -1,9 +1,9 @@
FROM caddy:2.7.4-builder AS builder FROM caddy:2.7.5-builder AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/porkbun \ --with github.com/caddy-dns/porkbun \
--with github.com/caddyserver/replace-response --with github.com/caddyserver/replace-response
FROM caddy:2.7.4 FROM caddy:2.7.5
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@ -18,10 +18,11 @@ up () {
--volume /mammoth/archive/cavepedia/cavepedia-data/00_files:/www/bigcavemaps.com/files/cavepedia-data/00_files:ro \ --volume /mammoth/archive/cavepedia/cavepedia-data/00_files:/www/bigcavemaps.com/files/cavepedia-data/00_files:ro \
--volume /mammoth/archive/vpicc/public:/www/bigcavemaps.com/files/vpicc:ro \ --volume /mammoth/archive/vpicc/public:/www/bigcavemaps.com/files/vpicc:ro \
--volume /mammoth/archive/websites/wacz:/www/bigcavemaps.com/files/websites:ro \ --volume /mammoth/archive/websites/wacz:/www/bigcavemaps.com/files/websites:ro \
--volume /mammoth/files/seaturtle.pw:/www/seaturtle.pw/files:ro \
--volume /mammoth/gis/bigcavemaps.com:/www/bigcavemaps.com/index:ro \ --volume /mammoth/gis/bigcavemaps.com:/www/bigcavemaps.com/index:ro \
--volume /mammoth/gis/source/public:/www/bigcavemaps.com/files/gis/source/public:ro \ --volume /mammoth/gis/source/public:/www/bigcavemaps.com/files/gis/source/public:ro \
--volume /mammoth/merginmaps/projects:/merginmaps-data:ro \
--volume /mammoth/replayweb.page:/www/files/bigcavemaps.com/replayweb.page:ro \ --volume /mammoth/replayweb.page:/www/files/bigcavemaps.com/replayweb.page:ro \
--volume /mammoth/files/seaturtle.pw:/www/seaturtle.pw/files:ro \
--volume $HOME/scripts-private/lech/Caddyfile:/etc/caddy/Caddyfile:ro \ --volume $HOME/scripts-private/lech/Caddyfile:/etc/caddy/Caddyfile:ro \
--volume /mammoth/caddy/data:/data:rw \ --volume /mammoth/caddy/data:/data:rw \
--publish 80:80 \ --publish 80:80 \

View File

@ -2,7 +2,7 @@
set -e set -e
TRUSTED_PROXY_IP=172.25.0.0/16 TRUSTED_PROXY_IP=172.0.0.0/8
LOCAL_DOMAIN=social.bigcavemaps.com LOCAL_DOMAIN=social.bigcavemaps.com
REDIS_HOST=mastodon-redis REDIS_HOST=mastodon-redis
REDIS_PORT=6379 REDIS_PORT=6379

52
lech/docker/merginmaps.sh Executable file
View File

@ -0,0 +1,52 @@
#!/bin/bash
set -e
up () {
docker run \
--detach \
--restart unless-stopped \
--name merginmaps-server \
--env-file $HOME/scripts-private/lech/merginmaps.env \
--user 901:999 \
--volume /mammoth/merginmaps/projects:/data:rw \
--network pew-net \
lutraconsulting/merginmaps-backend:2023.6.1
docker run \
--detach \
--restart unless-stopped \
--name merginmaps-web \
--network pew-net \
lutraconsulting/merginmaps-frontend:2023.6.1
docker run \
--detach \
--restart unless-stopped \
--name merginmaps-pg \
--env POSTGRES_USER=merginmaps \
--env POSTGRES_PASSWORD=merginmaps \
--volume /mammoth/merginmaps/db:/var/lib/postgresql/data:rw \
--network pew-net \
postgres:14
docker run \
--detach \
--restart unless-stopped \
--name merginmaps-redis \
--network pew-net \
redis
}
down () {
docker stop merginmaps-server || true
docker rm merginmaps-server || true
docker stop merginmaps-web || true
docker rm merginmaps-web || true
docker stop merginmaps-pg || true
docker rm merginmaps-pg || true
docker stop merginmaps-redis || true
docker rm merginmaps-redis || true
}
$@

View File

@ -11,7 +11,7 @@ up () {
--runtime nvidia \ --runtime nvidia \
--env PUID=1000 \ --env PUID=1000 \
--env PGID=1000 \ --env PGID=1000 \
--env PLEX_CLAIM=claim--s3HWLR-i1491PiefRwG \ --env PLEX_CLAIM=claim-k6mB7nUo_Ts8rnotGAQR \
--env NVIDIA_VISIBLE_DEVICES=all \ --env NVIDIA_VISIBLE_DEVICES=all \
--env VERSION=docker \ --env VERSION=docker \
--volume /mammoth/plex/config:/config:rw \ --volume /mammoth/plex/config:/config:rw \

View File

@ -3,23 +3,17 @@
set -e set -e
up () { up () {
pushd qgis-server &>/dev/null # Exposed on port 80 in pew-net
docker build -t qgis-server:dev .
popd &>/dev/null
# Exposed on port 5555 in pew-net
docker run \ docker run \
--detach \ --detach \
--name qgis-server \ --name qgis-server \
--restart unless-stopped \ --restart unless-stopped \
--label com.centurylinklabs.watchtower.enable=false \ --label com.centurylinklabs.watchtower.enable=false \
--env DEBUG=1 \ --env SKIP_NGINX=true \
--env LANG=en_EN.UTF-8 \ --volume /mammoth/gis/qgis-server/data:/io/data:ro \
--env QGIS_PROJECT_FILE=/data/cogtest/cogtest.qgz \ --volume /mammoth/gis/qgis-server/plugins:/io/plugins:rw \
--env QGIS_SERVER_LOG_LEVEL=0 \
--volume /mammoth/gis/qgis-server/data:/data:ro \
--network pew-net \ --network pew-net \
qgis-server:dev qgis/qgis-server:ltr
} }
down () { down () {

View File

@ -1,50 +0,0 @@
FROM debian:bullseye-slim
ENV LANG=en_EN.UTF-8
RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests --allow-unauthenticated -y \
gnupg \
ca-certificates \
wget \
locales \
&& localedef -i en_US -f UTF-8 en_US.UTF-8 \
# Add the current key for package downloading
# Please refer to QGIS install documentation (https://www.qgis.org/fr/site/forusers/alldownloads.html#debian-ubuntu)
&& mkdir -m755 -p /etc/apt/keyrings \
&& wget -O /etc/apt/keyrings/qgis-archive-keyring.gpg https://download.qgis.org/downloads/qgis-archive-keyring.gpg \
# Add repository for latest version of qgis-server
# Please refer to QGIS repositories documentation if you want other version (https://qgis.org/en/site/forusers/alldownloads.html#repositories)
&& echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/debian bullseye main" | tee /etc/apt/sources.list.d/qgis.list \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests --allow-unauthenticated -y \
qgis-server \
spawn-fcgi \
xauth \
xvfb \
&& apt-get remove --purge -y \
gnupg \
wget \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -m qgis
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENV QGIS_PREFIX_PATH /usr
ENV QGIS_SERVER_LOG_STDERR 1
ENV QGIS_SERVER_LOG_LEVEL 2
COPY cmd.sh /home/qgis/cmd.sh
RUN chmod -R 777 /home/qgis/cmd.sh
RUN chown qgis:qgis /home/qgis/cmd.sh
USER qgis
WORKDIR /home/qgis
ENTRYPOINT ["/tini", "--"]
CMD ["/home/qgis/cmd.sh"]

View File

@ -1,5 +0,0 @@
#!/bin/bash
[[ $DEBUG == "1" ]] && env
exec /usr/bin/xvfb-run --auto-servernum --server-num=1 /usr/bin/spawn-fcgi -p 5555 -n -d /home/qgis -- /usr/lib/cgi-bin/qgis_mapserv.fcgi