Compare commits
4
Commits
9a7b6010e2
...
6f1d022aef
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f1d022aef | ||
|
|
6ffae6e041 | ||
|
|
a9738b84fd | ||
|
|
eeb275d0eb |
No files matched your search
+1
-1
@@ -33,6 +33,7 @@ disabled.*
|
||||
|
||||
# 2024-01-23 Ignore true docker-compose files, only show examples from now on.
|
||||
docker-compose.yml
|
||||
compose.yml
|
||||
|
||||
# 2024-01-24 Hide static files for Hyperling.com.
|
||||
Config/Hyperling.com/files/*
|
||||
@@ -69,4 +70,3 @@ DEV-*
|
||||
Config/Prosody/conf.avail
|
||||
Config/Prosody/etc/conf.avail
|
||||
Config/Prosody/etc/
|
||||
|
||||
@@ -16,7 +16,6 @@ services:
|
||||
- "53:53/udp"
|
||||
- "53:53/tcp"
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -114,7 +114,6 @@ services:
|
||||
volumes:
|
||||
- fdroid_data:/root/fdroid
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -25,7 +25,6 @@ services:
|
||||
volumes:
|
||||
- ../../Volumes/Ghost/ghost:/var/lib/ghost/content
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -43,7 +42,6 @@ services:
|
||||
volumes:
|
||||
- ../../Volumes/Ghost/db:/var/lib/mysql
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU_DB
|
||||
|
||||
@@ -27,7 +27,6 @@ services:
|
||||
- USER_UID=1000
|
||||
- USER_GID=1000
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -26,7 +26,6 @@ services:
|
||||
environment:
|
||||
- "RUN_CROND=true"
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -1,11 +1,23 @@
|
||||
# 2025-08-13 Hyperling
|
||||
# Changelog
|
||||
## 20261027: Install hugo from source. paperMod currently requires ~150 and Debian has ~130, latest is ~160.
|
||||
|
||||
## Image ##
|
||||
FROM debian:trixie-slim
|
||||
USER root
|
||||
|
||||
## Setup ##
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# 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 --no-install-recommends \
|
||||
git nginx cron curl bash sudo htop golang gcc && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Hugo
|
||||
RUN CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@latest
|
||||
RUN ln -s $HOME/go/bin/hugo /usr/local/bin/hugo
|
||||
|
||||
# User and Group
|
||||
#RUN groupadd -r hugo && useradd -r -g hugo hugo
|
||||
@@ -31,5 +43,4 @@ RUN chmod +x /root/main.sh
|
||||
## Main ##
|
||||
# Install + Run Website
|
||||
WORKDIR /var/www/
|
||||
USER root
|
||||
CMD /root/main.sh "$REPO" "$BRANCH" "$PROD" "$DEV"
|
||||
@@ -23,7 +23,6 @@ services:
|
||||
retries: 2
|
||||
start_period: 30s
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -16,6 +16,7 @@ if [[ $status != 0 && -e /var/www/html/index.html && -z $FORCE ]]; then
|
||||
fi
|
||||
|
||||
# If the project was not already up to date, build the new files for NGINX.
|
||||
export PATH="/usr/local/bin:$PATH"
|
||||
hugo --gc --minify
|
||||
status="$?"
|
||||
echo "* Hugo status is '$status', FORCE is '$FORCE'."
|
||||
@@ -26,7 +27,3 @@ if [[ $status == 0 && -e public/index.html ]]; then
|
||||
fi
|
||||
|
||||
exit 0
|
||||
ww/html/
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@@ -15,7 +15,6 @@ services:
|
||||
volumes:
|
||||
- ./files:/var/www/api/files
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -48,7 +48,6 @@ services:
|
||||
# Avoid re-downloading language models every reboot.
|
||||
- libretranslate_models:/home/libretranslate/.local:rw
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -34,7 +34,6 @@ services:
|
||||
- MYSQL_USER=$MYSQL_USER
|
||||
- MYSQL_PASSWORD=$MYSQL_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.20'
|
||||
@@ -47,7 +46,6 @@ services:
|
||||
restart: always
|
||||
command: redis-server --requirepass $REDIS_HOST_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.10'
|
||||
@@ -95,7 +93,6 @@ services:
|
||||
- REDIS_HOST=$REDIS_HOST
|
||||
- REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.40'
|
||||
|
||||
@@ -32,7 +32,6 @@ services:
|
||||
- MYSQL_USER=$MYSQL_USER
|
||||
- MYSQL_PASSWORD=$MYSQL_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.50'
|
||||
@@ -48,7 +47,6 @@ services:
|
||||
restart: always
|
||||
command: redis-server --requirepass $REDIS_HOST_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.25'
|
||||
@@ -64,7 +62,6 @@ services:
|
||||
environment:
|
||||
- JWT_SECRET=$JWT_SECRET
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.75'
|
||||
@@ -96,7 +93,6 @@ services:
|
||||
- REDIS_HOST=$REDIS_HOST
|
||||
- REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: '2.00'
|
||||
|
||||
@@ -118,7 +118,6 @@ services:
|
||||
# Importing reorganizes files+folders, would rather they remain intact.
|
||||
#- "../../Volumes/PhotoPrism/imports_go_here:/photoprism/import"
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -149,7 +148,6 @@ services:
|
||||
MARIADB_PASSWORD: $MARIADB_PASSWORD
|
||||
MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU_DB
|
||||
|
||||
@@ -55,7 +55,6 @@ services:
|
||||
- prosody_certs:/etc/letsencrypt/live
|
||||
- prosody_cert_archive:/etc/letsencrypt/archive
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -35,7 +35,6 @@ services:
|
||||
volume:
|
||||
subpath: arch
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -65,7 +64,6 @@ services:
|
||||
volume:
|
||||
subpath: debian
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -95,7 +93,6 @@ services:
|
||||
volume:
|
||||
subpath: fedora
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -125,7 +122,6 @@ services:
|
||||
volume:
|
||||
subpath: opensuse
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -155,7 +151,6 @@ services:
|
||||
volume:
|
||||
subpath: ubuntu
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
|
||||
@@ -21,7 +21,6 @@ services:
|
||||
- ../../Volumes/ReverseProxy/letsencrypt-certs:/etc/nginx/certs
|
||||
command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU
|
||||
@@ -36,7 +35,6 @@ services:
|
||||
- ../../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;'"
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $CPU_LE
|
||||
|
||||
@@ -43,7 +43,6 @@ services:
|
||||
WORDPRESS_DB_PASSWORD: $MARIADB_ROOT_PASSWORD
|
||||
WORDPRESS_DEBUG: $WORDPRESS_DEBUG
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $WP_CPU
|
||||
@@ -69,7 +68,6 @@ services:
|
||||
MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
|
||||
MARIADB_AUTO_UPGRADE: $MARIADB_AUTO_UPGRADE
|
||||
deploy:
|
||||
mode: global
|
||||
resources:
|
||||
limits:
|
||||
cpus: $WP_CPU_DB
|
||||
|
||||
Reference in new issue
Block a user