From 0c34e5fffa3c28ee78166b90634ab0fb4b559394 Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Fri, 14 Mar 2025 22:03:14 +0100 Subject: [PATCH] Remove images moved to Ansible 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. --- images/caddy/Dockerfile | 15 --------- images/caddy/entrypoint.sh | 14 -------- images/fava/Dockerfile | 59 ---------------------------------- images/fava/requirements.txt | 14 -------- images/fluentd/Dockerfile | 32 ------------------ images/fluentd/Gemfile | 10 ------ images/forgejo/Dockerfile | 14 -------- images/frp/Dockerfile | 19 ----------- images/gotenberg/Dockerfile | 19 ----------- images/nextcloud/Dockerfile | 44 ------------------------- images/nextcloud/php-pgsql.ini | 11 ------- pipelines/build-and-push.json | 33 ------------------- 12 files changed, 284 deletions(-) delete mode 100644 images/caddy/Dockerfile delete mode 100755 images/caddy/entrypoint.sh delete mode 100644 images/fava/Dockerfile delete mode 100644 images/fava/requirements.txt delete mode 100644 images/fluentd/Dockerfile delete mode 100644 images/fluentd/Gemfile delete mode 100644 images/forgejo/Dockerfile delete mode 100644 images/frp/Dockerfile delete mode 100644 images/gotenberg/Dockerfile delete mode 100644 images/nextcloud/Dockerfile delete mode 100644 images/nextcloud/php-pgsql.ini diff --git a/images/caddy/Dockerfile b/images/caddy/Dockerfile deleted file mode 100644 index c73063c..0000000 --- a/images/caddy/Dockerfile +++ /dev/null @@ -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"] diff --git a/images/caddy/entrypoint.sh b/images/caddy/entrypoint.sh deleted file mode 100755 index 21eb735..0000000 --- a/images/caddy/entrypoint.sh +++ /dev/null @@ -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 diff --git a/images/fava/Dockerfile b/images/fava/Dockerfile deleted file mode 100644 index dd2d036..0000000 --- a/images/fava/Dockerfile +++ /dev/null @@ -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"] diff --git a/images/fava/requirements.txt b/images/fava/requirements.txt deleted file mode 100644 index 3decf92..0000000 --- a/images/fava/requirements.txt +++ /dev/null @@ -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 diff --git a/images/fluentd/Dockerfile b/images/fluentd/Dockerfile deleted file mode 100644 index d749b3b..0000000 --- a/images/fluentd/Dockerfile +++ /dev/null @@ -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 diff --git a/images/fluentd/Gemfile b/images/fluentd/Gemfile deleted file mode 100644 index 094f7d3..0000000 --- a/images/fluentd/Gemfile +++ /dev/null @@ -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' diff --git a/images/forgejo/Dockerfile b/images/forgejo/Dockerfile deleted file mode 100644 index 03ee271..0000000 --- a/images/forgejo/Dockerfile +++ /dev/null @@ -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 diff --git a/images/frp/Dockerfile b/images/frp/Dockerfile deleted file mode 100644 index 53b03b7..0000000 --- a/images/frp/Dockerfile +++ /dev/null @@ -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 <