diff --git a/_nginx/Dockerfile b/_nginx/Dockerfile index 51486a8..55a6bad 100644 --- a/_nginx/Dockerfile +++ b/_nginx/Dockerfile @@ -1,9 +1,9 @@ FROM docker.io/nginx:latest as base ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - cron \ - python3-certbot-nginx \ + cron \ + python3-certbot-nginx \ && rm -rf /var/lib/apt/lists/* COPY cron.d/ /etc/cron.d/ COPY entrypoint.d/ /docker-entrypoint.d/ diff --git a/_nginx/cron.d/certbot b/_nginx/cron.d/certbot index f8164b7..5a86927 100644 --- a/_nginx/cron.d/certbot +++ b/_nginx/cron.d/certbot @@ -1 +1 @@ -0 0 * * * root certbot --nginx -q renew +0 0 * * * root certbot --nginx renew > /proc/1/fd/1 diff --git a/_nginx/install_site/Dockerfile b/_nginx/install_site/Dockerfile index a19eb68..65faab6 100644 --- a/_nginx/install_site/Dockerfile +++ b/_nginx/install_site/Dockerfile @@ -1,10 +1,10 @@ FROM docker.io/debian:12-slim as base ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - certbot \ - gettext \ - netcat-openbsd \ + certbot \ + gettext \ + netcat-openbsd \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /usr/local/bin/ WORKDIR /web/ diff --git a/_nginx/install_site/entrypoint.sh b/_nginx/install_site/entrypoint.sh index 6ce727f..7f8b797 100755 --- a/_nginx/install_site/entrypoint.sh +++ b/_nginx/install_site/entrypoint.sh @@ -1,12 +1,12 @@ #!/bin/bash -x for URL in $BASE_URL $OTHER_URLS; do - certbot certonly -n \ - --webroot \ + certbot certonly -n \ + --webroot \ -w /var/www/certbot/ \ - --agree-tos \ - --no-eff-email \ - -m "$EMAIL" \ + --agree-tos \ + --no-eff-email \ + -m "$EMAIL" \ -d "$URL" done diff --git a/_template/Dockerfile b/_template/Dockerfile index ecdf444..4176b10 100644 --- a/_template/Dockerfile +++ b/_template/Dockerfile @@ -3,10 +3,10 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG APP="http://app.com/download" RUN curl -L "$APP" | tar xz --strip-components=1 diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 8cddb83..1889aeb 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -1,23 +1,19 @@ -FROM docker.io/python:3.11-slim as base -ENV DEBIAN_FRONTEND=noninteractive \ - PYTHONDONTWRITEBYTECODE=1 \ - PYTHONFAULTHANDLER=1 \ - PYTHONUNBUFFERED=1 \ - VIRTUAL_ENV="/opt/venv" \ +FROM docker.io/python:3.12-slim as base +ENV VIRTUAL_ENV="/opt/venv" \ PATH="/opt/venv/bin:$PATH" WORKDIR /app/ FROM base as build RUN python -m venv "$VIRTUAL_ENV" -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - unzip \ + ca-certificates \ + curl \ + unzip \ && rm -rf /var/lib/apt/lists/* ARG URL="https://github.com/morpheus65535/bazarr/releases/latest/download/bazarr.zip" -RUN curl -LO "$URL" \ - && unzip bazarr.zip \ +RUN curl -LO "$URL" \ + && unzip bazarr.zip \ && pip install -U --no-cache-dir -r requirements.txt \ && rm bazarr.zip diff --git a/bind9/Dockerfile b/bind9/Dockerfile index 15bb95c..17e5507 100644 --- a/bind9/Dockerfile +++ b/bind9/Dockerfile @@ -1,8 +1,8 @@ FROM docker.io/debian:12-slim -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - bind9 \ - bind9-dnsutils \ + bind9 \ + bind9-dnsutils \ && rm -rf /var/lib/apt/lists/* COPY named.conf.options /etc/bind/ COPY entrypoint.sh /usr/local/bin/ diff --git a/fdroid/Dockerfile b/fdroid/Dockerfile index b26f427..d77ab2b 100644 --- a/fdroid/Dockerfile +++ b/fdroid/Dockerfile @@ -1,9 +1,9 @@ FROM docker.io/nginx:latest -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - cron \ - fdroidserver \ - jq \ + cron \ + fdroidserver \ + jq \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /docker-entrypoint.d/99-entrypoint.sh COPY scripts/ /usr/local/bin/ diff --git a/fdroid/entrypoint.sh b/fdroid/entrypoint.sh index b087c9f..4ac89fd 100755 --- a/fdroid/entrypoint.sh +++ b/fdroid/entrypoint.sh @@ -3,9 +3,9 @@ (cd /repo/ || exit 1 fdroid init - sed -i \ + sed -i \ -e "/repo_url/s .* repo_url:\ https://$BASE_URL/repo " \ - -e "/repo_name/s .* repo_name:\ \"$REPO_NAME\" " \ + -e "/repo_name/s .* repo_name:\ \"$REPO_NAME\" " \ config.yml ) diff --git a/gitea/compose.yaml b/gitea/compose.yaml index 12413ec..71ebba1 100644 --- a/gitea/compose.yaml +++ b/gitea/compose.yaml @@ -23,7 +23,7 @@ services: - db:/var/lib/postgresql/data/ gitea: - image: docker.io/gitea/gitea:1.21-rootless + image: docker.io/gitea/gitea:latest-rootless restart: unless-stopped ports: - "$SSH_PORT:2222" diff --git a/gitea/setup.sh b/gitea/setup.sh index 35d3566..dc7be48 100755 --- a/gitea/setup.sh +++ b/gitea/setup.sh @@ -12,7 +12,7 @@ docker-compose up -d --build read -r ) -sed -i -e "s/^SSH_PORT.*/SSH_PORT = $SSH_PORT/" \ +sed -i -e "s/^SSH_PORT.*/SSH_PORT = $SSH_PORT/" \ -e 's/^SSH_LISTEN_PORT.*/SSH_LISTEN_PORT = 2222/' \ /var/lib/docker/volumes/gitea_config/_data/app.ini diff --git a/ldap/Dockerfile b/ldap/Dockerfile index 99a8ad4..14678b3 100644 --- a/ldap/Dockerfile +++ b/ldap/Dockerfile @@ -1,10 +1,10 @@ -FROM debian:12-slim +FROM docker.io/debian:12-slim ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - ldap-utils \ - slapd \ + ca-certificates \ + ldap-utils \ + slapd \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /usr/local/bin/ EXPOSE 389 636 diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 776abe7..4d62d4e 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -3,22 +3,22 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG LIDARR="http://lidarr.servarr.com/v1/update/master/updatefile?os=linux&runtime=netcore&arch=x64" RUN curl -L "$LIDARR" | tar xz --strip-components=1 FROM base RUN useradd -m app -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - libchromaprint-tools \ - mediainfo \ - sqlite3 \ + ca-certificates \ + libchromaprint-tools \ + mediainfo \ + sqlite3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /app/ . COPY entrypoint.sh /usr/local/bin/ diff --git a/mail/dovecot/Dockerfile b/mail/dovecot/Dockerfile index 43cc411..a323aef 100644 --- a/mail/dovecot/Dockerfile +++ b/mail/dovecot/Dockerfile @@ -1,10 +1,10 @@ FROM docker.io/debian:12-slim -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - dovecot-imapd \ - dovecot-lmtpd \ - dovecot-managesieved \ - dovecot-sieve \ + dovecot-imapd \ + dovecot-lmtpd \ + dovecot-managesieved \ + dovecot-sieve \ && rm -rf /var/lib/apt/lists/* COPY dovecot/ /etc/dovecot/ EXPOSE 110 995 \ diff --git a/mail/postfix/Dockerfile b/mail/postfix/Dockerfile index d189e85..3d1855e 100644 --- a/mail/postfix/Dockerfile +++ b/mail/postfix/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/debian:12-slim -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - postfix \ + postfix \ && rm -rf /var/lib/apt/lists/* COPY main.cf /etc/postfix/ EXPOSE 25 587 diff --git a/matrix/coturn/Dockerfile b/matrix/coturn/Dockerfile index cca7c3a..e67c35e 100644 --- a/matrix/coturn/Dockerfile +++ b/matrix/coturn/Dockerfile @@ -1,8 +1,8 @@ FROM docker.io/coturn/coturn:4.6 USER root -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - gettext-base \ + gettext-base \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /usr/local/bin/ COPY turnserver.conf /etc/coturn/ diff --git a/monero/Dockerfile b/monero/Dockerfile index 175a602..45ff1fa 100644 --- a/monero/Dockerfile +++ b/monero/Dockerfile @@ -3,13 +3,13 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - curl \ + bzip2 \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* -ARG MONERO='https://downloads.getmonero.org/cli/linux64' +ARG MONERO="https://downloads.getmonero.org/cli/linux64" RUN curl -L "$MONERO" | tar xj --strip-components=1 FROM base @@ -19,7 +19,7 @@ RUN mkdir -p /home/app/.bitmonero/ && chown -R app:app /home/app/ VOLUME /home/app/.bitmonero/ /wallet/ EXPOSE 18080 18081 USER app -CMD ["./monerod", "--non-interactive", "--confirm-external-bind", \ - "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", \ +CMD ["./monerod", "--non-interactive", "--confirm-external-bind", \ + "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", \ "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=18081", "--restricted-rpc" \ ] diff --git a/mullvad_openvpn/Dockerfile b/mullvad_openvpn/Dockerfile index 31dbd40..eb5cda5 100644 --- a/mullvad_openvpn/Dockerfile +++ b/mullvad_openvpn/Dockerfile @@ -1,9 +1,9 @@ FROM docker.io/debian:12-slim WORKDIR /etc/openvpn/ ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - openvpn \ + openvpn \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh/ /usr/local/bin/ COPY openvpn/ /etc/openvpn/ diff --git a/mullvad_wireguard/Dockerfile b/mullvad_wireguard/Dockerfile index db4d775..f20b690 100644 --- a/mullvad_wireguard/Dockerfile +++ b/mullvad_wireguard/Dockerfile @@ -1,10 +1,10 @@ FROM docker.io/debian:12-slim as base ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - iproute2 \ - openresolv \ - wireguard \ + iproute2 \ + openresolv \ + wireguard \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh/ /usr/local/bin/ COPY wireguard/ /etc/wireguard/ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index ae94f8d..6a18b57 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -3,21 +3,21 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG PROWLARR="http://prowlarr.servarr.com/v1/update/develop/updatefile?os=linux&runtime=netcore&arch=x64" RUN curl -L "$PROWLARR" | tar xz --strip-components=1 FROM base RUN useradd -m app -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - libicu72 \ - sqlite3 \ + ca-certificates \ + libicu72 \ + sqlite3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /app/ . VOLUME /config/ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 31b5c34..fcfbe6c 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -3,21 +3,21 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG RADARR="http://radarr.servarr.com/v1/update/master/updatefile?os=linux&runtime=netcore&arch=x64" RUN curl -L "$RADARR" | tar xz --strip-components=1 FROM base RUN useradd -m app -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - libicu72 \ - sqlite3 \ + ca-certificates \ + libicu72 \ + sqlite3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /app/ . COPY entrypoint.sh /usr/local/bin/ diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 66f1e53..7a63afa 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -3,21 +3,21 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG READARR="https://readarr.servarr.com/v1/update/develop/updatefile?os=linux&runtime=netcore&arch=x64" RUN curl -L "$READARR" | tar xz --strip-components=1 FROM base RUN useradd -m app -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - libicu72 \ - sqlite3 \ + ca-certificates \ + libicu72 \ + sqlite3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /app/ . COPY entrypoint.sh /usr/local/bin/ diff --git a/searxng/compose.yaml b/searxng/compose.yaml index 281043f..782b6b1 100644 --- a/searxng/compose.yaml +++ b/searxng/compose.yaml @@ -25,8 +25,8 @@ services: - SEARXNG_SECRET - SEARXNG_REDIS_URL=redis://redis volumes: - - ./config/limiter.toml:/etc/searxng/limiter.toml:ro - - ./config/settings.yml:/etc/searxng/settings.yml:ro + - ./limiter.toml:/etc/searxng/limiter.toml:ro + - ./settings.yml:/etc/searxng/settings.yml:ro networks: - default - nginx diff --git a/searxng/config/.gitignore b/searxng/config/.gitignore deleted file mode 100644 index 92b7f03..0000000 --- a/searxng/config/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!.gitignore -!limiter.toml -!settings.yml diff --git a/searxng/config/limiter.toml b/searxng/limiter.toml similarity index 100% rename from searxng/config/limiter.toml rename to searxng/limiter.toml diff --git a/searxng/config/settings.yml b/searxng/settings.yml similarity index 98% rename from searxng/config/settings.yml rename to searxng/settings.yml index 015a6d4..d675bb9 100644 --- a/searxng/config/settings.yml +++ b/searxng/settings.yml @@ -468,6 +468,12 @@ engines: # # get your API key from: https://core.ac.uk/api-keys/register/ # api_key: 'unset' + - name: cppreference + engine: cppreference + shortcut: cpp + paging: false + disabled: true + - name: crossref engine: crossref shortcut: cr @@ -550,6 +556,16 @@ engines: require_api_key: false results: JSON language: de + tests: + bahnhof: + matrix: + query: berlin + lang: en + result_container: + - not_empty + - ['one_title_contains', 'Berlin Hauptbahnhof'] + test: + - unique_results - name: deezer engine: deezer @@ -1444,23 +1460,7 @@ engines: - name: pypi shortcut: pypi - engine: xpath - paging: true - search_url: https://pypi.org/search/?q={query}&page={pageno} - results_xpath: /html/body/main/div/div/div/form/div/ul/li/a[@class="package-snippet"] - url_xpath: ./@href - title_xpath: ./h3/span[@class="package-snippet__name"] - content_xpath: ./p - suggestion_xpath: /html/body/main/div/div/div/form/div/div[@class="callout-block"]/p/span/a[@class="link"] - first_page_num: 1 - categories: [it, packages] - about: - website: https://pypi.org - wikidata_id: Q2984686 - official_api_documentation: https://warehouse.readthedocs.io/api-reference/index.html - use_official_api: false - require_api_key: false - results: HTML + engine: pypi - name: qwant qwant_categ: web @@ -1567,7 +1567,7 @@ engines: - name: internetarchivescholar engine: internet_archive_scholar shortcut: ias - timeout: 5.0 + timeout: 15.0 - name: superuser engine: stackexchange @@ -1859,6 +1859,16 @@ engines: about: website: https://species.wikimedia.org/ wikidata_id: Q13679 + tests: + wikispecies: + matrix: + query: "Campbell, L.I. et al. 2011: MicroRNAs" + lang: en + result_container: + - not_empty + - ['one_title_contains', 'Tardigrada'] + test: + - unique_results - name: wiktionary engine: mediawiki @@ -2152,6 +2162,11 @@ engines: engine: tootfinder shortcut: toot + - name: voidlinux + engine: voidlinux + shortcut: void + disabled: true + - name: wallhaven engine: wallhaven # api_key: abcdefghijklmnopqrstuvwxyz diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 000c374..86de84b 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -3,21 +3,21 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR /app/ FROM base as build -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ + ca-certificates \ + curl \ && rm -rf /var/lib/apt/lists/* ARG SONARR="https://services.sonarr.tv/v1/download/main/latest?version=4&os=linux&arch=x64" RUN curl -L "$SONARR" | tar xz --strip-components=1 FROM base RUN useradd -m app -RUN apt-get update \ +RUN apt-get update \ && apt-get install -y --no-install-recommends \ - libicu72 \ - libsqlite3-0 \ - libssl3 \ + libicu72 \ + libsqlite3-0 \ + libssl3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /app/ . COPY entrypoint.sh /usr/local/bin/ diff --git a/woodpecker/.env b/woodpecker/.env deleted file mode 100644 index 795e316..0000000 --- a/woodpecker/.env +++ /dev/null @@ -1,8 +0,0 @@ -BASE_URL=cicd. -EMAIL= - -WOODPECKER_AGENT_SECRET= #$(openssl rand -hex 32) -WOODPECKER_GITEA=true -WOODPECKER_GITEA_URL= -WOODPECKER_GITEA_CLIENT= -WOODPECKER_GITEA_SECRET= diff --git a/woodpecker/compose.yaml b/woodpecker/compose.yaml deleted file mode 100644 index 18b9267..0000000 --- a/woodpecker/compose.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -services: - install_site: - build: install_site - environment: - - BASE_URL - - EMAIL - volumes: - - ./nginx.conf:/web/woodpecker.conf - - sites:/sites/ - - certs:/etc/letsencrypt/ - - certbotroot:/var/www/certbot/ - - /var/run/docker.sock:/var/run/docker.sock - - woodpecker-server: - image: docker.io/woodpeckerci/woodpecker-server:v2.0.0 - restart: unless-stopped - env_file: - - .env - environment: - - WOODPECKER_OPEN=true - - WOODPECKER_HOST=https://$BASE_URL - volumes: - - server-data:/var/lib/woodpecker/ - networks: - - nginx - - default - - woodpecker-agent: - image: docker.io/woodpeckerci/woodpecker-agent:v2.0.0 - restart: unless-stopped - command: agent - environment: - - WOODPECKER_SERVER=woodpecker-server:9000 - - WOODPECKER_AGENT_SECRET - volumes: - - agent-config:/etc/woodpecker/ - - /var/run/docker.sock:/var/run/docker.sock - depends_on: - - woodpecker-server - - -volumes: - server-data: - agent-config: - sites: - external: true - certs: - external: true - certbotroot: - external: true - -networks: - nginx: - external: true diff --git a/woodpecker/install_site b/woodpecker/install_site deleted file mode 120000 index 846f55c..0000000 --- a/woodpecker/install_site +++ /dev/null @@ -1 +0,0 @@ -../_nginx/install_site \ No newline at end of file diff --git a/woodpecker/nginx.conf b/woodpecker/nginx.conf deleted file mode 100644 index f99f783..0000000 --- a/woodpecker/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name $BASE_URL; - - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - server_name $BASE_URL; - - http2 on; - - ssl_certificate /etc/letsencrypt/live/$BASE_URL/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem; - - - location / { - proxy_pass http://woodpecker-server:8000; - - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - - chunked_transfer_encoding off; - proxy_buffering off; - proxy_redirect off; - } -}