Redesign slidefactory

.gitignore

@@ -0,0 +1,2 @@
+*.sif
+*.tar

Dockerfile

@@ -0,0 +1,87 @@
+FROM docker.io/alpine:3.17 AS slidefactory-files
+
+ARG VERSION
+
+ADD LICENSE /slidefactory/
+ADD fonts/ /slidefactory/fonts/
+ADD theme/ /slidefactory/theme/
+ADD slidefactory.py /slidefactory/
+
+# Remove possible temporary files
+RUN find /slidefactory -name '*~' -delete
+RUN find /slidefactory -name '.*' -delete
+
+# Fix permissions
+RUN chmod 755 /slidefactory && \
+    find /slidefactory -type d -exec chmod 755 {} \; && \
+    find /slidefactory -type f -exec chmod 644 {} \; && \
+    chmod 755 /slidefactory/slidefactory.py
+
+# Add checksums
+RUN cd /slidefactory && \
+    find . -type f -print0 | xargs -0 sha256sum > /tmp/sha256sums_$VERSION && \
+    mv /tmp/sha256sums_$VERSION /slidefactory/
+
+
+FROM docker.io/alpine:3.17
+
+RUN apk update && \
+    apk add --no-cache \
+      ca-certificates \
+      chromium \
+      git \
+      pandoc \
+      font-freefont \
+      python3 \
+      py3-pandocfilters \
+      py3-yaml \
+      tar \
+      zip \
+      && \
+    rm -rf /var/cache/apk/*
+
+# Reveal.js
+RUN wget https://github.com/hakimel/reveal.js/archive/refs/tags/4.4.0.zip -O tmp.zip && \
+    unzip tmp.zip 'reveal.js-4.4.0/LICENSE' -d /slidefactory && \
+    unzip tmp.zip 'reveal.js-4.4.0/dist/*' -d /slidefactory && \
+    unzip tmp.zip 'reveal.js-4.4.0/plugin/*' -d /slidefactory && \
+    rm -f tmp.zip
+
+# MathJax
+RUN wget https://github.com/mathjax/MathJax/archive/refs/tags/3.2.2.zip -O tmp.zip && \
+    unzip tmp.zip 'MathJax-3.2.2/LICENSE' -d /slidefactory && \
+    unzip tmp.zip 'MathJax-3.2.2/es5/tex-chtml-full.js' -d /slidefactory && \
+    unzip tmp.zip 'MathJax-3.2.2/es5/input/tex/extensions/*' -d /slidefactory && \
+    unzip tmp.zip 'MathJax-3.2.2/es5/output/chtml/fonts/woff-v2/*' -d /slidefactory && \
+    unzip tmp.zip 'MathJax-3.2.2/es5/adaptors/*' -d /slidefactory && \
+    rm -f tmp.zip
+
+# Fonts
+RUN FONT_DIR=NotoSans && \
+    mkdir -p /slidefactory/fonts/$FONT_DIR && \
+    wget https://github.com/notofonts/latin-greek-cyrillic/releases/download/NotoSans-v2.013/NotoSans-v2.013.zip -O tmp.zip && \
+    unzip -j tmp.zip 'NotoSans/googlefonts/ttf/*' -d /slidefactory/fonts/$FONT_DIR && \
+    unzip -j tmp.zip 'OFL.txt' -d /slidefactory/fonts/$FONT_DIR && \
+    rm tmp.zip
+
+RUN FONT_DIR=Inconsolata && \
+    mkdir -p /slidefactory/fonts/$FONT_DIR && \
+    wget https://github.com/googlefonts/Inconsolata/archive/refs/tags/v3.000.zip -O tmp.zip && \
+    unzip -j tmp.zip 'Inconsolata-3.000/fonts/ttf/Inconsolata-*' -x '*Condensed*' '*Expanded*' -d /slidefactory/fonts/$FONT_DIR && \
+    unzip -j tmp.zip 'Inconsolata-3.000/OFL.txt' -d /slidefactory/fonts/$FONT_DIR && \
+    rm tmp.zip
+
+COPY --from=slidefactory-files /slidefactory/ /slidefactory/
+
+# Create executable
+RUN echo -e '#!/bin/sh\n\
+exec python3 /slidefactory/slidefactory.py "$@"\n\
+' > /usr/bin/slidefactory && \
+    chmod a+x /usr/bin/slidefactory
+
+RUN mkdir /work
+
+WORKDIR /work
+
+ENTRYPOINT ["slidefactory"]
+CMD ["-h"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 CSC - IT Center for Science Ltd.
+Copyright (c) 2017-2023 CSC - IT Center for Science Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,68 +1,24 @@
-DEF=slidefactory.def
-SIF=slidefactory.sif
+IMAGE_ROOT?=ghcr.io/csc-training
+IMAGE=slidefactory
+IMAGE_VERSION?=$(shell grep -m1 -oP '(?<=VERSION = ").+(?=")' slidefactory.py)
 
-ifndef PREFIX
-	PREFIX=$(HOME)
-endif
-INSTALL_BIN=$(PREFIX)/bin
-INSTALL_GIT=$(PREFIX)/lib/slidefactory
-GIT=https://github.com/csc-training/slide-template
 
-.PHONY: build clean install uninstall
-.PHONY: check clone git
+build: Dockerfile slidefactory.py
+	docker build \
+		--label "org.opencontainers.image.source=https://github.com/csc-training/slidefactory" \
+		--label "org.opencontainers.image.description=slidefactory" \
+		--build-arg VERSION=${IMAGE_VERSION} \
+		-t ${IMAGE_ROOT}/${IMAGE}:${IMAGE_VERSION} \
+		.
 
-build: $(SIF)
+push:
+	docker push ${IMAGE_ROOT}/${IMAGE}:${IMAGE_VERSION}
 
-clean:
-	rm $(SIF)
-
-check:
-	@if [ -e $(INSTALL_GIT) ]; then \
-		echo "Already installed. Please run 'make uninstall' to remove old installation."; \
-		exit 1; \
-	fi
-
-clone:
-	git clone --recursive . $(INSTALL_GIT)
-	cd $(INSTALL_GIT) && git remote set-url origin $(GIT) && git fetch origin
-
-git:
-	@make -s check
-	@make -s clone
-	@echo ""
-	@echo "Installed:"
-	@echo "  $(INSTALL_GIT)/"
-	@echo ""
-	@echo "Please add the following into your .bashrc or similar"
-	@echo "  export SLIDEFACTORY=$(INSTALL_GIT)"
+singularity:
+	rm -f $(IMAGE).sif $(IMAGE).tar
+	docker save $(IMAGE_ROOT)/$(IMAGE):$(IMAGE_VERSION) -o $(IMAGE).tar
+	singularity build $(IMAGE).sif docker-archive://$(IMAGE).tar
+	rm -f $(IMAGE).tar
 
-install: build
-	@make -s check
-	@if [ ! -d $(INSTALL_BIN) ]; then \
-		mkdir -p $(INSTALL_BIN); \
-	fi
-	cp -i $(SIF) $(INSTALL_BIN)/
-	@make -s clone
-	@echo ""
-	@echo "Installed:"
-	@echo "  $(INSTALL_BIN)/$(SIF)"
-	@echo "  $(INSTALL_GIT)/"
-	@echo ""
-	@echo "Please add the following into your .bashrc or similar"
-	@echo "  export SLIDEFACTORY=$(INSTALL_GIT)"
-
-uninstall:
-	@echo "Removing:"
-	@if [ -e $(INSTALL_BIN)/$(SIF) ]; then \
-		echo "  $(INSTALL_BIN)/$(SIF)"; \
-	fi
-	@echo "  $(INSTALL_GIT)/"
-	@read -r -p "Proceed [Y/n]? " OK; \
-	[ "$$OK" = "y" ] || [ "$$OK" = "Y" ] || [ "$$OK" = "" ] || (exit 1;)
-	@if [ -e $(INSTALL_BIN)/$(SIF) ]; then \
-		rm -f $(INSTALL_BIN)/$(SIF); \
-	fi
-	rm -rf $(INSTALL_GIT)
-
-%.sif: %.def
-	sudo singularity build $@ $<
+clean:
+	rm -f $(IMAGE).sif $(IMAGE).tar