1
Fork 0

Compare commits

...

2 commits

Author SHA1 Message Date
5f335b3b25
fix(deps): update rust crate cli-table to 0.5.0 2025-03-25 14:31:17 +00:00
0c34e5fffa
Remove images moved to Ansible
Some checks failed
build/fava Building image fava
build/fluentd Building image fluentd
build/gotenberg Building image gotenberg
build/nextcloud Building image nextcloud
build/caddy Building image caddy
build/base Building image base
build/mx-puppet-steam Building image mx-puppet-steam
build/node-script Building image node-script
build/python-script Building image python-script
build/forgejo Building image forgejo
build/ruby-script Building image ruby-script
build/lua-clib Building image lua-clib
build/gitea Building images gitea-package, gitea-pr, gitea-status
build/rust-xwin Building image rust-xwin
The various images that I used to build for Watchtower to update
services on the homelab won't be needed anymore. Dependency updates will
be handled there.
2025-03-25 15:15:19 +01:00
14 changed files with 30 additions and 319 deletions

View file

@ -1,15 +0,0 @@
FROM caddy:2.9.1-builder AS builder
RUN xcaddy build \
--with github.com/WeidiDeng/caddy-cloudflare-ip \
--with github.com/caddy-dns/cloudflare
FROM caddy:2.9.1
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
COPY ./entrypoint.sh /entrypoint.sh
ENV CADDYFILE=/etc/caddy/Caddyfile
VOLUME /etc/caddy
ENTRYPOINT ["/entrypoint.sh"]

View file

@ -1,14 +0,0 @@
#!/bin/sh
set -e
CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}"
if [ "$1" = "validate" ] && [ -z "$2" ]; then
exec /usr/bin/caddy validate --config "$CADDYFILE"
elif [ -n "$1" ]; then
exec /usr/bin/caddy "$@"
else
/usr/bin/caddy validate --config "$CADDYFILE"
exec /usr/bin/caddy run --config "$CADDYFILE" --resume
fi

View file

@ -1,59 +0,0 @@
# renovate: datasource=github-tags depName=beancount packageName=beancount/beancount
ARG BEANCOUNT_VERSION=2.3.6
# renovate: datasource=github-tags depName=fava packageName=beancount/fava
ARG FAVA_VERSION=1.30
FROM node:22.14.0-slim AS node_build_env
ARG FAVA_VERSION
RUN set -eux; \
apt-get update; \
apt-get install -y python3-babel git make;
RUN git clone --depth 1 --branch v${FAVA_VERSION} https://github.com/beancount/fava /tmp/build/fava;
WORKDIR /tmp/build/fava
RUN set -eux; \
make -j $(nproc); \
rm -rf .*cache .eggs .tox build dist frontend/node_modules; \
find . -type f -name '*.py[c0]' -delete; \
find . -type d -name "__pycache__" -delete;
FROM python:3.13.2-slim AS build_env
ARG BEANCOUNT_VERSION
ENV PATH "/app/bin:$PATH"
RUN set -eux; \
apt-get update; \
apt-get install -y build-essential libxml2-dev libxslt-dev curl git; \
python -mvenv /app;
COPY --from=node_build_env /tmp/build/fava /tmp/build/fava
RUN git clone --depth 1 --branch ${BEANCOUNT_VERSION} https://github.com/beancount/beancount /tmp/build/beancount;
WORKDIR /tmp/build/beancount
COPY requirements.txt ./
RUN set -eux; \
CFLAGS=-s pip3 install -U /tmp/build/beancount; \
pip3 install -U /tmp/build/fava; \
pip3 install -r requirements.txt; \
pip3 uninstall -y pip; \
rm -r /app/share; \
find /app -name __pycache__ -exec rm -rf -v {} +
FROM python:3.13.2-slim
COPY --from=build_env /app /app
# Default fava port number
EXPOSE 5000
ENV BEAN_ROOT ""
ENV BEANCOUNT_FILE ""
ENV FAVA_HOST "0.0.0.0"
ENV PATH "/app/bin:$PATH"
CMD ["fava"]

View file

@ -1,14 +0,0 @@
# Ensure a compatible version of Beancount, including personal tooling
beancount<3.0.0
beancount-reds-plugins==0.3.0
beanprice==1.2.1
fava_envelope==0.5.9
fava-investor==1.0.1
# renovate: branch=main
git+https://github.com/andreasgerstmayr/fava-dashboards.git@c45503dccc0a86c3767a2c71dfb234c48d5ca905
git+https://github.com/beancount/beangrow.git@b7d9ea9610f5cdf88c0b7dcc956971e12ee8614f
# renovate: branch=main
git+https://github.com/daniel-wells/beancount_checkclosed.git@5abc380703105c12b518144f83a5c4fe25cc8f39
# renovate: branch=main
git+https://github.com/PhracturedBlue/fava-portfolio-summary.git@7d3301619025d735830c389948e5527456050d44
git+https://github.com/scauligi/refried.git@cf64dfa8d116e860a7115d5990522808eeefea91

View file

@ -1,32 +0,0 @@
FROM fluent/fluentd:v1.17.1-1.1
USER root
# The recommendation is to install gems here. But in practice,
# the `geoip` plugin will fail if done so, because for unknown reasons,
# it wouldn't be able to find the `geoip2_c` gem, even though that would
# be installed successfully.
# The only way to get that plugin working is to use the `--gemfile` flag
# to have them installed at startup.
# Hence why we need to blow up this image with a bunch of dev dependencies.
RUN set -eux; \
apk add --no-cache --virtual .build-deps \
binutils \
autoconf \
automake \
gcc \
geoip-dev \
gettext \
libmaxminddb-dev \
libtool \
make \
musl-dev \
ruby-dev \
; \
# fluentd needs this directory when installing Gems
mkdir /etc/fluentd; \
chown fluent:fluent /etc/fluentd
USER fluent
COPY Gemfile /etc/fluentd/Gemfile

View file

@ -1,10 +0,0 @@
source 'https://rubygems.org'
gem 'fluentd'
gem 'geoip2_c'
gem 'fluent-plugin-geoip'
gem 'fluent-plugin-prometheus'
gem 'fluent-plugin-ua-parser'
gem 'fluent-plugin-grafana-loki'
gem 'fluent-plugin-stdout-pp'
gem 'fluent-plugin-parser-logfmt'

View file

@ -1,14 +0,0 @@
FROM codeberg.org/forgejo/forgejo:10.0.1
RUN apk --no-cache add \
asciidoctor \
freetype \
freetype-dev \
gcc \
g++ \
libpng \
libffi-dev \
py-pip \
python3-dev \
py3-pip \
py3-pyzmq

View file

@ -1,19 +0,0 @@
# renovate: datasource=github-releases depName=frp packageName=fatedier/frp
ARG FRP_VERSION=0.61.2
FROM scratch AS src
ARG FRP_VERSION
ADD https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_amd64.tar.gz /frp.tar.gz
FROM alpine:3.21
ARG FRP_VERSION
RUN --mount=from=src,target=/src <<EOF
tar -xf /src/frp.tar.gz -C /usr/local/bin --strip-component=1 frp_${FRP_VERSION}_linux_amd64/frpc frp_${FRP_VERSION}_linux_amd64/frps
EOF
VOLUME /etc/frp
WORKDIR /

View file

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 4
[[package]] [[package]]
name = "addr2line" name = "addr2line"
@ -172,7 +172,7 @@ dependencies = [
"clap_lex", "clap_lex",
"strsim", "strsim",
"unicase", "unicase",
"unicode-width", "unicode-width 0.1.13",
] ]
[[package]] [[package]]
@ -184,7 +184,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
] ]
[[package]] [[package]]
@ -195,25 +195,25 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]] [[package]]
name = "cli-table" name = "cli-table"
version = "0.4.9" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89" checksum = "14da8d951cef7cc4f13ccc9b744d736963d57863c7e6fc33c070ea274546082c"
dependencies = [ dependencies = [
"cli-table-derive", "cli-table-derive",
"csv", "csv",
"termcolor", "termcolor",
"unicode-width", "unicode-width 0.2.0",
] ]
[[package]] [[package]]
name = "cli-table-derive" name = "cli-table-derive"
version = "0.4.6" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94" checksum = "9f7c1b60bae2c3d45228dfb096046aa51ef6c300de70b658d7a13fcb0c4f832e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn",
] ]
[[package]] [[package]]
@ -291,9 +291,9 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]] [[package]]
name = "csv" name = "csv"
version = "1.3.0" version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
dependencies = [ dependencies = [
"csv-core", "csv-core",
"itoa", "itoa",
@ -726,7 +726,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
] ]
[[package]] [[package]]
@ -758,9 +758,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.86" version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -815,9 +815,9 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.37" version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -1070,7 +1070,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
] ]
[[package]] [[package]]
@ -1157,20 +1157,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.109" version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1212,7 +1201,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
] ]
[[package]] [[package]]
@ -1407,6 +1396,12 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
[[package]]
name = "unicode-width"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"
@ -1490,7 +1485,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -1524,7 +1519,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -1684,7 +1679,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn",
] ]
[[package]] [[package]]

View file

@ -13,7 +13,7 @@ serde_json = "1.0.95"
serde = { version = "1.0.159", features = ["derive"] } serde = { version = "1.0.159", features = ["derive"] }
time = { version = "0.3.20", features = ["formatting", "parsing", "serde"] } time = { version = "0.3.20", features = ["formatting", "parsing", "serde"] }
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
cli-table = "0.4.7" cli-table = "0.5.0"
globwalk = "0.9.0" globwalk = "0.9.0"
[profile.release] [profile.release]

View file

@ -1,19 +0,0 @@
FROM gotenberg/gotenberg:8.17.3
USER root
RUN set -eux; \
apt-get update -qq; \
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -t bookworm-backports libreoffice-l10n-de; \
sed -i '/de_DE.UTF-8/s/^# //g' /etc/locale.gen; \
locale-gen; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*;
# Adjust user for Unraid
RUN usermod -u 2000 -g 100 gotenberg
ENV LANG de_DE.UTF-8
ENV LANGUAGE de_DE:de
ENV LC_ALL de_DE.UTF-8
USER gotenberg

View file

@ -1,44 +0,0 @@
FROM nextcloud:31.0.1-apache
# renovate: datasource=github-releases depName=yt-dlp packageName=yt-dlp/yt-dlp versioning=loose
ARG YTDLP_VERSION=2025.03.25
# Debian ships node.js v18, make sure that the pageres version supports that
# renovate: datasource=npm packageName=pageres-cli
ARG PAGERES_VERSION=8.0.0
RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends --no-install-suggests \
aria2 \
cifs-utils \
clamav \
ffmpeg \
libnss3 \
libbz2-dev \
nodejs \
npm \
smbclient \
p7zip \
p7zip-full \
python3-pip \
unzip \
wget \
; \
docker-php-ext-install bz2; \
npm install --global pageres-cli@${PAGERES_VERSION} puppeteer; \
npx puppeteer browsers install chrome; \
curl -L -o /usr/local/bin/youtube-dl https://github.com/yt-dlp/yt-dlp/releases/download/${YTDLP_VERSION}/yt-dlp; \
chmod +rx /usr/local/bin/youtube-dl; \
apt-get remove -y --auto-remove ${PHPIZE_DEPS}; \
rm -rf \
/var/lib/apt/lists/* \
/var/log/*/.log /var/log/apt/* \
/usr/src/php.tar* \
/usr/share/man/* \
/usr/share/doc/* \
/usr/share/doc-base/* \
/usr/local/php/man/* \
/root/.cache \
/root/.npm
COPY ./php-pgsql.ini /etc/php8/conf.d/pgsql.ini

View file

@ -1,11 +0,0 @@
# configuration for PHP PostgreSQL module
extension=pdo_pgsql.so
extension=pgsql.so
[PostgresSQL]
pgsql.allow_persistent = On
pgsql.auto_reset_persistent = Off
pgsql.max_persistent = 25
pgsql.max_links = 30
pgsql.ignore_notice = 0
pgsql.log_notice = 0

View file

@ -20,30 +20,6 @@
"type": "simple", "type": "simple",
"name": "base" "name": "base"
}, },
{
"type": "simple",
"name": "nextcloud"
},
{
"type": "simple",
"name": "gotenberg"
},
{
"type": "simple",
"name": "fluentd"
},
{
"type": "simple",
"name": "forgejo"
},
{
"type": "simple",
"name": "frp"
},
{
"type": "simple",
"name": "fava"
},
{ {
"type": "file", "type": "file",
"name": "rust-xwin" "name": "rust-xwin"
@ -51,15 +27,6 @@
{ {
"type": "file", "type": "file",
"name": "gitea" "name": "gitea"
},
{
"type": "simple",
"name": "mx-puppet-steam"
},
{
"type": "simple",
"name": "caddy",
"platform": "linux/amd64,linux/arm64/v8"
} }
] ]
} }