update deployment container and script

Author: gcerar

Dockerfile

@@ -22,50 +22,39 @@ SHELL ["/bin/bash", "--login", "-exc"]
 
 WORKDIR /src
 
-RUN <<EOT
-# Initial packages
-apt-get update -q
-apt-get install -qyy \
-    -o APT::Install-Recommends=false \
-    -o APT::Install-Suggests=false \
-    curl ca-certificates gdebi gnupg2 build-essential make git rsync python3-pip
-
-# Download NodeJS
-curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
-apt-get update -q
-apt-get install -qyy \
-    -o APT::Install-Recommends=false \
-    -o APT::Install-Suggests=false \
-    nodejs
-
-# Install Hugo static site generator
-curl -o hugo.deb -L https://github.com/gohugoio/hugo/releases/download/v${HUGO}/hugo_extended_${HUGO}_linux-amd64.deb
-gdebi --non-interactive hugo.deb 
-rm hugo.deb
-
-# Cleanup
-apt-get clean
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Ensure user and group exists
-groupadd --non-unique -g ${GID} -o ${UNAME}
-useradd -m --uid ${UID} --gid ${GID} -o -s /bin/bash ${UNAME}
-chown -R ${UID}:${GID} /src
-
-EOT
+RUN : \
+    && apt-get update -q \
+    && apt-get install -qyy \
+        -o APT::Install-Recommends=false \
+        -o APT::Install-Suggests=false \
+        curl ca-certificates gdebi gnupg2 build-essential \
+        make git rsync python3-pip \
+    && (curl -fsSL https://deb.nodesource.com/setup_22.x | bash -) \
+    && apt-get update -q \
+    && apt-get install -qyy \
+        -o APT::Install-Recommends=false \
+        -o APT::Install-Suggests=false \
+        nodejs \
+    && curl -o hugo.deb -L https://github.com/gohugoio/hugo/releases/download/v${HUGO}/hugo_extended_${HUGO}_linux-amd64.deb \
+    && gdebi --non-interactive hugo.deb \
+    && rm hugo.deb \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && groupadd --non-unique -g ${GID} -o ${UNAME} \
+    && useradd -m --uid ${UID} --gid ${GID} -o -s /bin/bash ${UNAME} \
+    && chown -R ${UID}:${GID} /src \
+    && :
 
 
 USER ${UID}:${GID}
 
 ENV PATH="${PATH}:/home/${UNAME}/.local/bin"
 
-RUN <<EOT
-python3 -m pip install \
+RUN python3 -m pip install \
     --user \
     --no-cache-dir \
     --break-system-packages \
     "arxiv~=2.1.0" \
     requests \
     unidecode \
     ujson
-EOT

Makefile

@@ -7,6 +7,8 @@ HUGO_PROD_SERVER_ARGS= --gc --minify --disableFastRender
 
 HUGO_PROD_BUILD_ARGS= --gc --minify --baseURL=$(BASE_URL) --environment production
 
+CONTAINER_NAME := sensorlab/hugo
+
 # HELP
 # This will output the help for each task
 # thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
@@ -31,7 +33,7 @@ dev: container  ## Run Hugo in container with development mode
 		-v $(shell pwd):/src \
 		-p=$(PORT):1313 \
 		--name hugo-builder \
-		sensorlab/hugo \
+		$(CONTAINER_NAME) \
 		hugo server $(HUGO_DEV_SERVER_ARGS) --bind 0.0.0.0
 
 
@@ -42,7 +44,7 @@ shell: container ## Run shell inside container
 		-v $(shell pwd):/src \
 		-p=$(PORT):1313 \
 		--name hugo-builder \
-		sensorlab/hugo
+		$(CONTAINER_NAME)
 
 
 cobiss:  ## Update COBISS entries with Python scripts
@@ -77,7 +79,7 @@ build: container  ## produce public folder with content in container
 		-e BABEL_ENV=production \
 		-e HUGO_GA_ID=G-QP8B1RRWGH \
 		--name hugo-builder \
-		sensorlab/hugo \
+		$(CONTAINER_NAME) \
 		bash -c "make clean && make cobiss && make public && make clean"
 
 
@@ -95,9 +97,9 @@ deploy: container  ## produce public folder with content in container
 		-e BABEL_ENV=production \
 		-e HUGO_GA_ID=G-QP8B1RRWGH \
 		--name hugo-builder \
-		sensorlab/hugo \
+		$(CONTAINER_NAME) \
 		bash -c "make clean && make cobiss && make public.tmp && make sync && make clean"
 
 
 container:
-	docker build -t sensorlab/hugo .
+	docker build -t $(CONTAINER_NAME) .