better define which lighttpd instance to look for

.gitignore

@@ -5,6 +5,7 @@ fsfe.org
 fsfe-website
 
 lighttpd-fsfe*.log
+php-errors.log
 
 # ignore everything in fsfe.org/ and status/ but keep the folders
 fsfe.org/*

Dockerfile

@@ -10,14 +10,10 @@ RUN apk add --no-cache \
     libxml2-utils \
     libxslt \
     make \
-    nodejs \
-    nodejs-npm \
     procps \
     python3 \
     rsync
 
-RUN npm install -g less
-
 RUN mkdir -p /fsfe-local-build/fsfe.org
 
 EXPOSE 8000

docker-cmd.sh

@@ -2,30 +2,26 @@
 ########################################################################
 #  Copyright (C) 2019 Michael Weimann <mweimann@fsfe.org>
 ########################################################################
-#  
+#
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
-#  
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#  
+#
 ########################################################################
-#  
+#
 #  This script is executed in docker CMD.
-#  
+#
 #######################################################################
 
-# Set up the less watcher
-cd /fsfe-local-build
-sh less-watch.sh &
-
 # Run the preview server
 cd /fsfe-local-build/fsfe.org
 python3 -m http.server

fsfe-build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# =============================================================================
+# Start a build of the fsfe-website checkout in the current working directory
+# =============================================================================
+# SPDX-FileCopyrightText: © 2020 Reinhard Müller <reinhard@fsfe.org>
+# SPDX-License-Identifier: WTFPL
+# =============================================================================
+
+set -e
+
+# Find out fsfe-website directory
+gitdir="$(git rev-parse --show-toplevel)"
+
+# Find out fsfe-local-build directory
+builddir="$(dirname "$(readlink -f "$0")")"
+
+# Start the build
+echo "Building from ${gitdir} into ${builddir}/fsfe.org"
+"${gitdir}/build/build_main.sh" build_run "${builddir}/fsfe.org" --statusdir "${builddir}/status"

fsfe-preview.sh

@@ -173,7 +173,7 @@ for ((i=1; i <= $numargs; i++)); do
       echo_INFO "$HTTPD webserver already seems to be running."
     fi
   elif [ "$HTTPD" == "lighttpd" ]; then
-    if [ ! $(pgrep lighttpd) ]; then   # lighttpd
+    if [ ! $(pgrep -f "lighttpd.*${HTTPD_conf}") ]; then   # lighttpd
       echo_INFO "Starting $HTTPD webserver"
       /usr/sbin/lighttpd -f "$HTTPD_conf"
     else

less-watch.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-########################################################################
-#  Copyright (C) 2019 Michael Weimann <mweimann@fsfe.org>
-########################################################################
-#  
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#  
-########################################################################
-#  
-#  This script sets up a watcher that re-compiles the fsfe website
-#  styles on changes.
-#  
-#######################################################################
-
-while inotifywait \
-    -r -e close_write -e create -e moved_to \
-    --exclude '\.(swx|swp|min\.css)' fsfe-website/look; do
-    lessc -x fsfe-website/look/fsfe.less fsfe-website/look/fsfe.min.css;
-done
-