Compare commits

...
13 Commits
20 changed files with 22 additions and 50 deletions

No files matched your search

+1 -1
View File
@@ -33,6 +33,7 @@ disabled.*
# 2024-01-23 Ignore true docker-compose files, only show examples from now on. # 2024-01-23 Ignore true docker-compose files, only show examples from now on.
docker-compose.yml docker-compose.yml
compose.yml
# 2024-01-24 Hide static files for Hyperling.com. # 2024-01-24 Hide static files for Hyperling.com.
Config/Hyperling.com/files/* Config/Hyperling.com/files/*
@@ -69,4 +70,3 @@ DEV-*
Config/Prosody/conf.avail Config/Prosody/conf.avail
Config/Prosody/etc/conf.avail Config/Prosody/etc/conf.avail
Config/Prosody/etc/ Config/Prosody/etc/
-2
View File
@@ -10,13 +10,11 @@ services:
container_name: dns-app container_name: dns-app
build: build:
context: ./ context: ./
network: host
restart: always restart: always
ports: ports:
- "53:53/udp" - "53:53/udp"
- "53:53/tcp" - "53:53/tcp"
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -14,7 +14,6 @@ services:
container_name: fd-app container_name: fd-app
build: build:
context: ./ context: ./
network: host
args: args:
#WEBROOT: ${WEBROOT} #WEBROOT: ${WEBROOT}
#REPO: ${REPO} #REPO: ${REPO}
@@ -114,7 +113,6 @@ services:
volumes: volumes:
- fdroid_data:/root/fdroid - fdroid_data:/root/fdroid
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -25,7 +25,6 @@ services:
volumes: volumes:
- ../../Volumes/Ghost/ghost:/var/lib/ghost/content - ../../Volumes/Ghost/ghost:/var/lib/ghost/content
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -43,7 +42,6 @@ services:
volumes: volumes:
- ../../Volumes/Ghost/db:/var/lib/mysql - ../../Volumes/Ghost/db:/var/lib/mysql
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU_DB cpus: $CPU_DB
-1
View File
@@ -27,7 +27,6 @@ services:
- USER_UID=1000 - USER_UID=1000
- USER_GID=1000 - USER_GID=1000
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
-1
View File
@@ -26,7 +26,6 @@ services:
environment: environment:
- "RUN_CROND=true" - "RUN_CROND=true"
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
+17 -2
View File
@@ -1,11 +1,27 @@
# 2025-08-13 Hyperling # 2025-08-13 Hyperling
# Changelog
## 20261027: Install hugo from source. paperMod currently requires ~150 and Debian has ~130, latest is ~160.
## Image ## ## Image ##
FROM debian:trixie-slim FROM debian:trixie-slim
USER root
## Setup ## ## Setup ##
ARG DEBIAN_FRONTEND=noninteractive
# System Dependencies # System Dependencies
RUN apt-get update && apt-get install -y git hugo nginx cron curl bash sudo htop RUN apt-get update && \
apt-get install -y \
git nginx cron curl bash sudo \
golang gcc ca-certificates && \
rm -rf /var/lib/apt/lists/*
# Compile Hugo (same version Artix is currently shipping, rather than latest.)
RUN CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@v0.164.0
# Install Hugo
RUN mv -v $HOME/go/bin/hugo /usr/local/bin/hugo && \
chmod -v 755 /usr/local/bin/hugo
# User and Group # User and Group
#RUN groupadd -r hugo && useradd -r -g hugo hugo #RUN groupadd -r hugo && useradd -r -g hugo hugo
@@ -31,5 +47,4 @@ RUN chmod +x /root/main.sh
## Main ## ## Main ##
# Install + Run Website # Install + Run Website
WORKDIR /var/www/ WORKDIR /var/www/
USER root
CMD /root/main.sh "$REPO" "$BRANCH" "$PROD" "$DEV" CMD /root/main.sh "$REPO" "$BRANCH" "$PROD" "$DEV"
@@ -6,7 +6,7 @@ services:
container_name: hugo container_name: hugo
build: build:
context: ./ context: ./
network: host image: hyperling-hugo:latest
restart: always restart: always
ports: ports:
- 8013:80 # Production minified files served using NGINX. - 8013:80 # Production minified files served using NGINX.
@@ -23,7 +23,6 @@ services:
retries: 2 retries: 2
start_period: 30s start_period: 30s
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
+1 -1
View File
@@ -8,7 +8,7 @@ COMPOSE_BAKE=true
# #
## Git Website Repository ## ## Git Website Repository ##
# #
REPO=https://git.hyperling.com/me/hugo-jackanope REPO=https://git.hyperling.com/me/hugo-recipes
BRANCH=prod BRANCH=prod
# #
+1 -5
View File
@@ -16,7 +16,7 @@ if [[ $status != 0 && -e /var/www/html/index.html && -z $FORCE ]]; then
fi fi
# If the project was not already up to date, build the new files for NGINX. # If the project was not already up to date, build the new files for NGINX.
hugo --gc --minify /usr/local/bin/hugo --gc --minify
status="$?" status="$?"
echo "* Hugo status is '$status', FORCE is '$FORCE'." echo "* Hugo status is '$status', FORCE is '$FORCE'."
if [[ $status == 0 && -e public/index.html ]]; then if [[ $status == 0 && -e public/index.html ]]; then
@@ -26,7 +26,3 @@ if [[ $status == 0 && -e public/index.html ]]; then
fi fi
exit 0 exit 0
ww/html/
fi
exit 0
@@ -6,7 +6,6 @@ services:
container_name: www-app container_name: www-app
build: build:
context: ./ context: ./
network: host
restart: always restart: always
ports: ports:
- 8317:8080 - 8317:8080
@@ -15,7 +14,6 @@ services:
volumes: volumes:
- ./files:/var/www/api/files - ./files:/var/www/api/files
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -26,7 +26,6 @@ services:
container_name: lt-app container_name: lt-app
build: build:
context: ./ context: ./
network: host
restart: always restart: always
ports: ports:
- "5000:5000" - "5000:5000"
@@ -48,7 +47,6 @@ services:
# Avoid re-downloading language models every reboot. # Avoid re-downloading language models every reboot.
- libretranslate_models:/home/libretranslate/.local:rw - libretranslate_models:/home/libretranslate/.local:rw
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -34,7 +34,6 @@ services:
- MYSQL_USER=$MYSQL_USER - MYSQL_USER=$MYSQL_USER
- MYSQL_PASSWORD=$MYSQL_PASSWORD - MYSQL_PASSWORD=$MYSQL_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.20' cpus: '0.20'
@@ -47,7 +46,6 @@ services:
restart: always restart: always
command: redis-server --requirepass $REDIS_HOST_PASSWORD command: redis-server --requirepass $REDIS_HOST_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.10' cpus: '0.10'
@@ -95,7 +93,6 @@ services:
- REDIS_HOST=$REDIS_HOST - REDIS_HOST=$REDIS_HOST
- REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD - REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.40' cpus: '0.40'
@@ -32,7 +32,6 @@ services:
- MYSQL_USER=$MYSQL_USER - MYSQL_USER=$MYSQL_USER
- MYSQL_PASSWORD=$MYSQL_PASSWORD - MYSQL_PASSWORD=$MYSQL_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.50' cpus: '0.50'
@@ -48,7 +47,6 @@ services:
restart: always restart: always
command: redis-server --requirepass $REDIS_HOST_PASSWORD command: redis-server --requirepass $REDIS_HOST_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.25' cpus: '0.25'
@@ -64,7 +62,6 @@ services:
environment: environment:
- JWT_SECRET=$JWT_SECRET - JWT_SECRET=$JWT_SECRET
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '0.75' cpus: '0.75'
@@ -96,7 +93,6 @@ services:
- REDIS_HOST=$REDIS_HOST - REDIS_HOST=$REDIS_HOST
- REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD - REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: '2.00' cpus: '2.00'
@@ -118,7 +118,6 @@ services:
# Importing reorganizes files+folders, would rather they remain intact. # Importing reorganizes files+folders, would rather they remain intact.
#- "../../Volumes/PhotoPrism/imports_go_here:/photoprism/import" #- "../../Volumes/PhotoPrism/imports_go_here:/photoprism/import"
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -149,7 +148,6 @@ services:
MARIADB_PASSWORD: $MARIADB_PASSWORD MARIADB_PASSWORD: $MARIADB_PASSWORD
MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU_DB cpus: $CPU_DB
@@ -32,7 +32,6 @@ services:
container_name: prosody container_name: prosody
build: build:
context: ./ context: ./
network: host
restart: always restart: always
ports: ports:
- 5222:5222 - 5222:5222
@@ -55,7 +54,6 @@ services:
- prosody_certs:/etc/letsencrypt/live - prosody_certs:/etc/letsencrypt/live
- prosody_cert_archive:/etc/letsencrypt/archive - prosody_cert_archive:/etc/letsencrypt/archive
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -16,7 +16,6 @@ services:
build: build:
context: ./ context: ./
dockerfile: Dockerfiles/arch dockerfile: Dockerfiles/arch
network: host
args: args:
PACKAGES: ${PACKAGES} PACKAGES: ${PACKAGES}
EXTRA_ARCH: ${EXTRA_ARCH} EXTRA_ARCH: ${EXTRA_ARCH}
@@ -35,7 +34,6 @@ services:
volume: volume:
subpath: arch subpath: arch
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -46,7 +44,6 @@ services:
build: build:
context: ./ context: ./
dockerfile: Dockerfiles/debian dockerfile: Dockerfiles/debian
network: host
args: args:
PACKAGES: ${PACKAGES} PACKAGES: ${PACKAGES}
EXTRA_DEBIAN: ${EXTRA_DEBIAN} EXTRA_DEBIAN: ${EXTRA_DEBIAN}
@@ -65,7 +62,6 @@ services:
volume: volume:
subpath: debian subpath: debian
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -76,7 +72,6 @@ services:
build: build:
context: ./ context: ./
dockerfile: Dockerfiles/fedora dockerfile: Dockerfiles/fedora
network: host
args: args:
PACKAGES: ${PACKAGES} PACKAGES: ${PACKAGES}
EXTRA_FEDORA: ${EXTRA_FEDORA} EXTRA_FEDORA: ${EXTRA_FEDORA}
@@ -95,7 +90,6 @@ services:
volume: volume:
subpath: fedora subpath: fedora
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -106,7 +100,6 @@ services:
build: build:
context: ./ context: ./
dockerfile: Dockerfiles/opensuse dockerfile: Dockerfiles/opensuse
network: host
args: args:
PACKAGES: ${PACKAGES} PACKAGES: ${PACKAGES}
EXTRA_OPENSUSE: ${EXTRA_OPENSUSE} EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
@@ -125,7 +118,6 @@ services:
volume: volume:
subpath: opensuse subpath: opensuse
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -136,7 +128,6 @@ services:
build: build:
context: ./ context: ./
dockerfile: Dockerfiles/ubuntu dockerfile: Dockerfiles/ubuntu
network: host
args: args:
PACKAGES: ${PACKAGES} PACKAGES: ${PACKAGES}
EXTRA_UBUNTU: ${EXTRA_UBUNTU} EXTRA_UBUNTU: ${EXTRA_UBUNTU}
@@ -155,7 +146,6 @@ services:
volume: volume:
subpath: ubuntu subpath: ubuntu
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -11,7 +11,6 @@ services:
container_name: rp-app container_name: rp-app
build: build:
context: ./ context: ./
network: host
restart: always restart: always
ports: ports:
- "80:80" - "80:80"
@@ -21,7 +20,6 @@ services:
- ../../Volumes/ReverseProxy/letsencrypt-certs:/etc/nginx/certs - ../../Volumes/ReverseProxy/letsencrypt-certs:/etc/nginx/certs
command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'" command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU cpus: $CPU
@@ -36,7 +34,6 @@ services:
- ../../Volumes/ReverseProxy/letsencrypt-certs:/etc/letsencrypt/nginx - ../../Volumes/ReverseProxy/letsencrypt-certs:/etc/letsencrypt/nginx
entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; cp -rL /etc/letsencrypt/live/* /etc/letsencrypt/nginx/; sleep 12h & wait $${!}; done;'" entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; cp -rL /etc/letsencrypt/live/* /etc/letsencrypt/nginx/; sleep 12h & wait $${!}; done;'"
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $CPU_LE cpus: $CPU_LE
@@ -43,7 +43,6 @@ services:
WORDPRESS_DB_PASSWORD: $MARIADB_ROOT_PASSWORD WORDPRESS_DB_PASSWORD: $MARIADB_ROOT_PASSWORD
WORDPRESS_DEBUG: $WORDPRESS_DEBUG WORDPRESS_DEBUG: $WORDPRESS_DEBUG
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $WP_CPU cpus: $WP_CPU
@@ -69,7 +68,6 @@ services:
MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
MARIADB_AUTO_UPGRADE: $MARIADB_AUTO_UPGRADE MARIADB_AUTO_UPGRADE: $MARIADB_AUTO_UPGRADE
deploy: deploy:
mode: global
resources: resources:
limits: limits:
cpus: $WP_CPU_DB cpus: $WP_CPU_DB
+1 -1
View File
@@ -56,7 +56,7 @@ if [[ "$pkgmgr" == "apt" ]]; then
elif [[ $pkgmgr == "pacman" ]]; then elif [[ $pkgmgr == "pacman" ]]; then
pacman -Rcns --noconfirm *docker* pacman -Rcns --noconfirm *docker*
pacman -Sy --noconfirm docker docker-compose && pacman -Sy --noconfirm docker docker-compose docker-buildx ca-certificates &&
echo "Success!" && echo "Success!" &&
exit 0 exit 0
fi fi