~dricottone/container-images

e61b929e86a9f7fb86ddc619e5d2a25ced8d3d28 — Dominic Ricottone a month ago a9f674c dev
Okay now really things are updated
4 files changed, 22 insertions(+), 7 deletions(-)

M nginx/Dockerfile.webdav
M nginx/nginx.conf
M srht-core/Dockerfile
M srht-nginx/Dockerfile
M nginx/Dockerfile.webdav => nginx/Dockerfile.webdav +1 -1
@@ 1,4 1,4 @@
FROM docker.io/library/nginx:alpine as builder
FROM docker.io/library/nginx:alpine AS builder

COPY nginx-dav-ext-module /nginx-dav-ext-module


M nginx/nginx.conf => nginx/nginx.conf +15 -0
@@ 34,6 34,21 @@ http {
	deny 85.208.96.0/24;
	deny 185.191.171.0/24;

	# Fuck you OpenAI
	deny 20.171.206.0/24;

	# Fuck you Google
	deny 66.249.69.0/24;
	deny 66.249.75.0/24;

	# Fuck you Ahref
	deny 51.222.253.0/24;

	# Fuck you Bytedance
	deny 47.128.32.0/24;
	deny 47.128.37.0/24;
	deny 47.128.48.0/24;

	log_format main '$remote_addr - $remote_user [$time_local] "$request" '
		'$status $body_bytes_sent "$http_referer" '
		'"$http_user_agent" "$http_x_forwarded_for"';

M srht-core/Dockerfile => srht-core/Dockerfile +3 -3
@@ 1,4 1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN apk add --no-cache wget



@@ 6,12 6,12 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.bak
RUN arch="$(apk --print-arch)"; \
	case "$arch" in \
		x86_64) \
			repouri="https://mirror.sr.ht/alpine/v3.19/sr.ht"; \
			repouri="https://mirror.sr.ht/alpine/v3.20/sr.ht"; \
			keyuri="https://mirror.sr.ht/alpine"; \
			keyfile="alpine@sr.ht.rsa.pub"; \
			;; \
		aarch64) \
			repouri="https://pkg.intra.dominic-ricottone.com/alpine/v3.19"; \
			repouri="https://pkg.intra.dominic-ricottone.com/alpine/v3.20"; \
			keyuri="https://pkg.intra.dominic-ricottone.com/alpine"; \
			keyfile="me@dominic-ricottone.com.rsa.pub"; \
			;; \

M srht-nginx/Dockerfile => srht-nginx/Dockerfile +3 -3
@@ 4,7 4,7 @@ RUN apk add --no-cache git.sr.ht meta.sr.ht todo.sr.ht

FROM registry.intra.dominic-ricottone.com/nginx:latest

COPY --from=builder /usr/lib/python3.11/site-packages/gitsrht /var/www/gitsrht/
COPY --from=builder /usr/lib/python3.11/site-packages/metasrht /var/www/metasrht/
COPY --from=builder /usr/lib/python3.11/site-packages/todosrht /var/www/todosrht/
COPY --from=builder /usr/lib/python3.12/site-packages/gitsrht /var/www/gitsrht/
COPY --from=builder /usr/lib/python3.12/site-packages/metasrht /var/www/metasrht/
COPY --from=builder /usr/lib/python3.12/site-packages/todosrht /var/www/todosrht/