diff --git a/Dockerfile b/Dockerfile index e897e53..4753a11 100644 --- a/Dockerfile +++ b/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 diff --git a/docker-cmd.sh b/docker-cmd.sh index d02d434..fe3c443 100755 --- a/docker-cmd.sh +++ b/docker-cmd.sh @@ -2,30 +2,26 @@ ######################################################################## # Copyright (C) 2019 Michael Weimann ######################################################################## -# +# # 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 . -# +# ######################################################################## -# +# # 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 diff --git a/less-watch.sh b/less-watch.sh deleted file mode 100755 index f3f4430..0000000 --- a/less-watch.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -######################################################################## -# Copyright (C) 2019 Michael Weimann -######################################################################## -# -# 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 . -# -######################################################################## -# -# 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 -