scss via docker (2)

Makefile

@@ -63,15 +63,9 @@ push-docker:
 	docker image push $(DOCKER_REPO)/$(DOCKER_NAME):latest
 
 css:
-	docker build -t mscom-css-compile data/css_compress
+	docker build -t mscom-css-compile -f css_compress.dockerfile .
-	docker run --rm \
+	rm "www/data/css/styles.css" "www/data/css/styles.min.css" || true
-	    -v "$(shell pwd):/project" \
+	docker run --rm -v "$(shell pwd)/www:/project/www" "mscom-css-compile"
-	    -w /project/data/css_compress \
-	    mscom-css-compile \
-	    python3 /project/data/css_compress/compress.py \
-	        /project/www/data/css/styles.scss \
-	        /project/www/data/css/styles.css \
-	        /project/www/data/css/styles.min.css
 	docker image rm mscom-css-compile
 
 clean:

css_compress.dockerfile

@@ -0,0 +1,14 @@
+FROM node:22-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    python3 default-jre-headless \
+    && npm install -g sass \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+COPY ./data /project/data
+
+WORKDIR /project/data/css_compress
+
+USER 1000
+
+ENTRYPOINT [ "python3", "/project/data/css_compress/compress.py", "/project/www/data/css/styles.scss", "/project/www/data/css/styles.css", "/project/www/data/css/styles.min.css" ]

data/css_compress/Dockerfile

@@ -1,8 +0,0 @@
-FROM node:22-slim
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3 default-jre-headless \
-    && npm install -g sass \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /project

data/css_compress/compress.py

@@ -45,8 +45,8 @@ def comment_remover(text):
 fsource = str.replace(sys.argv[1], '\\', '/')  # scss
 finput  = str.replace(sys.argv[2], '\\', '/')  # css
 foutput = str.replace(sys.argv[3], '\\', '/')  # min.css
-ftemp1  = '__temp_compresss_py_1.tmp.css'
+ftemp1  = '/tmp/__temp_compresss_py_1.tmp.css'
-ftemp2  = '__temp_compresss_py_2.tmp.css'
+ftemp2  = '/tmp/__temp_compresss_py_2.tmp.css'
 
 print('======== INPUT ========')
 print()

www/data/css/styles_about.scss

@@ -123,7 +123,7 @@
   .egg_col_x5_3 { fill: #239a3b; }
   .egg_col_x5_4 { fill: #196127; }
 }
-@elseif $CFG_EGG_THEME == 'modern'
+@else if $CFG_EGG_THEME == 'modern'
 {
   .egg_col_x5_0 { fill: #afaca8; }
   .egg_col_x5_1 { fill: #d6e685; }
@@ -131,7 +131,7 @@
   .egg_col_x5_3 { fill: #44a340; }
   .egg_col_x5_4 { fill: #1e6823; }
 }
-@elseif $CFG_EGG_THEME == 'gray'
+@else if $CFG_EGG_THEME == 'gray'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #bdbdbd; }
@@ -139,7 +139,7 @@
   .egg_col_x5_3 { fill: #616161; }
   .egg_col_x5_4 { fill: #212121; }
 }
-@elseif $CFG_EGG_THEME == 'red'
+@else if $CFG_EGG_THEME == 'red'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #ff7171; }
@@ -147,7 +147,7 @@
   .egg_col_x5_3 { fill: #b70000; }
   .egg_col_x5_4 { fill: #830000; }
 }
-@elseif $CFG_EGG_THEME == 'blue'
+@else if $CFG_EGG_THEME == 'blue'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #6bcdff; }
@@ -155,7 +155,7 @@
   .egg_col_x5_3 { fill: #0079b7; }
   .egg_col_x5_4 { fill: #003958; }
 }
-@elseif $CFG_EGG_THEME == 'purple'
+@else if $CFG_EGG_THEME == 'purple'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #d2ace6; }
@@ -163,7 +163,7 @@
   .egg_col_x5_3 { fill: #660099; }
   .egg_col_x5_4 { fill: #4f2266; }
 }
-@elseif $CFG_EGG_THEME == 'orange'
+@else if $CFG_EGG_THEME == 'orange'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #ffcc80; }
@@ -171,7 +171,7 @@
   .egg_col_x5_3 { fill: #fb8c00; }
   .egg_col_x5_4 { fill: #e65100; }
 }
-@elseif $CFG_EGG_THEME == 'halloween'
+@else if $CFG_EGG_THEME == 'halloween'
 {
   .egg_col_x5_0 { fill: #eeeeee; }
   .egg_col_x5_1 { fill: #ffee4a; }
@@ -179,7 +179,7 @@
   .egg_col_x5_3 { fill: #fe9600; }
   .egg_col_x5_4 { fill: #03001c; }
 }
-@elseif $CFG_EGG_THEME == 'custom'
+@else if $CFG_EGG_THEME == 'custom'
 {
   .egg_col_x9_0 { fill: #F5F5F5; }
   .egg_col_x9_1 { fill: #DBDEE0; }