me/env-docker
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: me:4dd0661e1e8cffbe68cb6d5ad73628d161090d33
Branches Tags
me:main me:dev
...
compare: me:f622cba366e98994095197db987f5fdc0fd1e618
Branches Tags
me:dev me:main

3 Commits
4dd0661e1e ... f622cba366

Author SHA1 Message Date
Hyperling
f622cba366 Add the mail files to the container's log output. 2025-08-17 11:44:16 -07:00
Hyperling
e86660d34e Using the crontab command adds the job to root's jobs. Allow cron to pick up the file automatically by not running any explicit calls. 2025-08-17 11:43:54 -07:00
Hyperling
cfb07a6e93 Use the www-data user rather than creating a hugo user. 2025-08-17 11:26:47 -07:00
3 changed files with 15 additions and 8 deletions
Expand all files Collapse all files

7
Config/HugoExample/Dockerfile
View File

@@ -8,7 +8,7 @@ FROM debian:bookworm-slim
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 hugo nginx cron curl bash sudo htop
# User and Group # User and Group
RUN groupadd -r hugo && useradd -r -g hugo hugo #RUN groupadd -r hugo && useradd -r -g hugo hugo
# Hugo Directory Tree # Hugo Directory Tree
RUN mkdir -pv /var/www/hugo/ RUN mkdir -pv /var/www/hugo/
@@ -17,12 +17,11 @@ RUN mkdir -pv /var/www/hugo/
RUN mkdir -pv /var/www/html/ RUN mkdir -pv /var/www/html/
# Copy Cron Job to Update Git Repo # Copy Cron Job to Update Git Repo
COPY files/hugo.crontab /etc/cron.d/hugo COPY files/hugo.crontab /etc/crontab
COPY files/hugo.cronjob.sh /var/www/hugo/cronjob.sh COPY files/hugo.cronjob.sh /var/www/hugo/cronjob.sh
RUN crontab /etc/cron.d/hugo
# Hugo User Permissions # Hugo User Permissions
RUN chown -Rv hugo:hugo /var/www/ RUN chown -Rv www-data:www-data /var/www/
RUN chmod +x /var/www/hugo/cronjob.sh RUN chmod +x /var/www/hugo/cronjob.sh
# Copy Start Script # Copy Start Script

2
Config/HugoExample/files/hugo.crontab
View File

@@ -1 +1 @@
* * * * * hugo /var/www/hugo/cronjob.sh * * * * * www-data /var/www/hugo/cronjob.sh

14
Config/HugoExample/files/main.sh
View File

@@ -12,7 +12,7 @@ typeset -u DEV
echo "DEV=$DEV" echo "DEV=$DEV"
echo "*** Creating Git Repo ***" echo "*** Creating Git Repo ***"
sudo -u hugo git clone --recurse-submodules $REPO /var/www/hugo/site sudo -u www-data git clone --recurse-submodules $REPO /var/www/hugo/site
status="$?" status="$?"
echo "*** Validating Git Repo ***" echo "*** Validating Git Repo ***"
@@ -25,7 +25,7 @@ echo "* Site exists!"
echo "*** Copying Static Files to NGINX ***" echo "*** Copying Static Files to NGINX ***"
rm -rfv /var/www/html/* rm -rfv /var/www/html/*
sudo -u hugo /var/www/hugo/cronjob.sh sudo -u www-data /var/www/hugo/cronjob.sh
echo "*** Starting Cron ***" echo "*** Starting Cron ***"
service cron start service cron start
@@ -58,12 +58,20 @@ if [[ "$DEV" == "Y"* || "$DEV" == "T"* ]]; then
echo "* Dev server not detected, starting..." echo "* Dev server not detected, starting..."
cd /var/www/hugo/site cd /var/www/hugo/site
killall hugo 2>/dev/null killall hugo 2>/dev/null
sudo -u hugo hugo server -D --noBuildLock --bind 0.0.0.0 -p 1380 & sudo -u www-data hugo server -D --noBuildLock --bind 0.0.0.0 -p 1380 &
fi fi
sleep 30 sleep 30
done & done &
fi fi
echo "*** Following Mail Files ***"
cd /var/mail
touch mail www-data
chown -v mail:mail mail
chown -v www-data:mail www-data
chmod -v 660 mail www-data
tail -f mail www-data &
cd cd
echo "*** Finished $0 @ `date` ***" echo "*** Finished $0 @ `date` ***"