Browse Source

Removes less from docker (#5)

Michael Weimann 5 months ago
parent
commit
294a2ff8b0
3 changed files with 6 additions and 45 deletions
  1. 0
    4
      Dockerfile
  2. 6
    10
      docker-cmd.sh
  3. 0
    31
      less-watch.sh

+ 0
- 4
Dockerfile View File

@@ -10,14 +10,10 @@ RUN apk add --no-cache \
10 10
     libxml2-utils \
11 11
     libxslt \
12 12
     make \
13
-    nodejs \
14
-    nodejs-npm \
15 13
     procps \
16 14
     python3 \
17 15
     rsync
18 16
 
19
-RUN npm install -g less
20
-
21 17
 RUN mkdir -p /fsfe-local-build/fsfe.org
22 18
 
23 19
 EXPOSE 8000

+ 6
- 10
docker-cmd.sh View File

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

+ 0
- 31
less-watch.sh View File

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

Loading…
Cancel
Save