Compare commits

..
6 Commits
16 changed files with 45 additions and 27 deletions

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@
services:
app:
container_name: dns-app
container_name: dns
build:
context: ./
image: hyperling/dns:latest
+1 -1
View File
@@ -9,7 +9,7 @@ COMPOSE_BAKE=true
## Ghost ##
APP_NAME=ghost-app
APP_NAME=ghost
URL='http://localhost:8368'
+3 -3
View File
@@ -13,12 +13,12 @@ services:
# SQL Lite
## App ##
container_name: gitea-app
container_name: gitea
image: gitea/gitea:latest
restart: always
ports:
- "3001:3000"
- "2201:22"
- "$GITEA_WEB_PORT:3000"
- "$GITEA_SSH_PORT:22"
volumes:
- ../../Volumes/Gitea/gitea:/data
- /etc/timezone:/etc/timezone:ro
+5
View File
@@ -4,6 +4,11 @@
COMPOSE_BAKE=true
## Gitea ##
GITEA_WEB_PORT=3001
GITEA_SSH_PORT=2201
## Performance ##
# Micro Server
+1 -1
View File
@@ -13,7 +13,7 @@ services:
# SQL Lite
## App ##
container_name: gogs-app
container_name: gogs
image: gogs/gogs:latest
restart: always
ports:
+5 -5
View File
@@ -10,7 +10,7 @@ USER root
ARG DEBIAN_FRONTEND=noninteractive
# System Dependencies
run echo "Install Dependencies"
RUN echo "Install Dependencies"
RUN apt-get update && \
apt-get install -y \
git nginx cron curl bash sudo \
@@ -19,11 +19,11 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
# Compile Hugo (same version Artix is currently shipping, rather than latest.)
run echo "Compile Hugo"
RUN echo "Compile Hugo"
RUN CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@v0.164.0
# Install Hugo
run echo "Install Hugo"
RUN echo "Install Hugo"
RUN mv -v $HOME/go/bin/hugo /usr/local/bin/hugo && \
chmod -v 755 /usr/local/bin/hugo
@@ -31,8 +31,8 @@ RUN echo "Clean Up Go"
RUN rm -rfv /usr/local/go \
/root/go/pkg/mod \
/root/.cache/go-build \
/root/go \
&& apt-get remove -y --purge golang gcc && \
/root/go && \
apt-get remove -y --purge golang gcc && \
apt-get autoremove -y && \
apt-get clean && \
rm -rfv /var/lib/apt/lists/* /tmp/*
+13 -2
View File
@@ -3,9 +3,18 @@
cd /var/www/hugo/site
FORCE="$1"
BASEURL="$2"
# Pull URL from env if it exists, otherwise var2.
BASEURL="${BASEURL:-$2}"
declare baseurl
if [[ -n "$BASEURL" ]]; then
baseurl="-b $BASEURL"
fi
echo "*** Running cronjob @ `date` ***"
echo "FORCE=$FORCE"
echo "BASEURL=$BASEURL"
echo "baseurl=$baseurl"
# Pull any updates, and if the project is already up to date, exit successfully.
git pull | grep -v "up to date"
@@ -17,7 +26,9 @@ 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.
/usr/local/bin/hugo $BASEURL --gc --minify
set -x
/usr/local/bin/hugo $baseurl --gc --minify
set +x
status="$?"
echo "* Hugo status is '$status', FORCE is '$FORCE'."
if [[ $status == 0 && -e public/index.html ]]; then
+8 -6
View File
@@ -1,23 +1,23 @@
#!/usr/bin/env bash
REPO="$1"
export REPO="$1"
echo "REPO='$REPO'"
BRANCH="$2"
export BRANCH="$2"
if [[ -n $BRANCH ]]; then
BRANCH="--branch $BRANCH"
fi
echo "BRANCH='$BRANCH'"
PROD="$3"
export PROD="$3"
typeset -u PROD
echo "PROD='$PROD'"
DEV="$4"
export DEV="$4"
typeset -u DEV
echo "DEV='$DEV'"
BASEURL="$5"
export BASEURL="$5"
echo "BASEURL='$BASEURL'"
baseurl=""
if [[ -n "$BASEURL" ]]; then
@@ -47,7 +47,7 @@ mv -v $CLONE $SITE
echo "*** Copying Static Files to NGINX ***"
rm -rfv /var/www/html/*
sudo -u www-data /var/www/hugo/cronjob.sh "" "$baseurl"
sudo -u www-data /var/www/hugo/cronjob.sh " " "$BASEURL"
echo "*** Starting Cron ***"
service cron start
@@ -80,7 +80,9 @@ if [[ "$DEV" == "Y"* || "$DEV" == "T"* ]]; then
echo "* Dev server not detected, starting..."
cd $SITE
killall hugo 2>/dev/null
set -x
sudo -u www-data hugo server $baseurl -D -F --noBuildLock --bind 0.0.0.0 -p 1380 &
set +x
fi
sleep 30
done &
@@ -3,7 +3,7 @@
services:
app:
container_name: www-app
container_name: www
build:
context: ./
image: hyperling/website:latest
@@ -23,7 +23,7 @@ services:
## Main ##
lt-app:
container_name: lt-app
container_name: lt
build:
context: ./
image: hyperling/libretranslate:latest
+1 -1
View File
@@ -69,7 +69,7 @@ services:
## Nextcloud ##
nc-app:
container_name: nc-app
container_name: nc
build:
context: ./
image: hyperling/nextcloud:latest
+1 -1
View File
@@ -69,7 +69,7 @@ services:
## Nextcloud ##
nc-app:
container_name: nc-app
container_name: nc
build:
context: ./
image: hyperling/nextcloud:latest
+1 -1
View File
@@ -37,7 +37,7 @@
services:
pp-app:
container_name: pp-app
container_name: pp
image: photoprism/photoprism:latest
## Don't enable automatic restarts until PhotoPrism has been properly configured and tested!
## If the service gets stuck in a restart loop, this points to a memory, filesystem, network, or database issue:
+1 -1
View File
@@ -23,7 +23,7 @@ How to first begin using this subproject.
```
1. Verify it started correctly, no configuration file errors.
```
# docker logs rp-app
# docker logs rp
# docker logs rp-certbot
```
1. Create the real certificates.
@@ -8,7 +8,7 @@
services:
app:
container_name: rp-app
container_name: rp
build:
context: ./
image: hyperling/nginx-reverse-proxy:latest
@@ -18,7 +18,7 @@
services:
app:
container_name: wp-app
container_name: wp
image: wordpress:latest
restart: always
ports: