Merge branch 'develop' into 'main'

Merging develop into main

See merge request !3

.gitignore

 .idea/
 archive/
+/.ahoy.l3d
+/.ahoy.yml
+/.env

.gitlab-ci.yml

@@ -3,13 +3,18 @@ include:
     ref: main
     file: '/tagrelease.yml'
 
+variables:
+  VERSION: ${CI_COMMIT_TAG}
+
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
 build-master:
   stage: build
   script:
-    - docker build -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
+    - docker build --pull --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}:${VERSION} .
+    - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker tag ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:latest
+    - docker push ${CI_REGISTRY_IMAGE}:latest
   only:
     - tags

Dockerfile

 FROM ubuntu:20.04
 
-ARG VERSION=0.9.0
+ARG VERSION
 
 LABEL com.example.vendor="LakeDrops" \
       maintainer="juergen.haas@lakedrops.com" \
@@ -17,7 +17,7 @@ RUN echo "Adding system components" && \
                 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 \
                 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 \
                 libxss1 libxtst6 lsb-release wget xdg-utils && \
-    curl -L -o pandoc.deb https://github.com/jgm/pandoc/releases/download/2.9.2.1/pandoc-2.9.2.1-1-amd64.deb && \
+    curl -L -o pandoc.deb https://github.com/jgm/pandoc/releases/download/2.19.2/pandoc-2.19.2-1-amd64.deb && \
     dpkg -i pandoc.deb && \
     rm pandoc.deb
 

bin/mdshow

@@ -92,11 +92,11 @@ $(MDSHOW_CONFIG)/reveal.js/dist/fontawesome:
 
 $(MDSHOW_CONFIG)/reveal.js:
 	mkdir -p $@
-	curl -L https://github.com/hakimel/reveal.js/archive/4.1.0.zip -o $@/revealjs.zip
+	curl -L https://github.com/hakimel/reveal.js/archive/refs/tags/4.4.0.zip -o $@/revealjs.zip
 	unzip $@/revealjs.zip -d $@
 	rm $@/revealjs.zip
-	mv $@/reveal.js-4.1.0/.??* $@/reveal.js-4.1.0/* $@
-	rmdir $@/reveal.js-4.1.0
+	mv $@/reveal.js-4.4.0/.??* $@/reveal.js-4.4.0/* $@
+	rmdir $@/reveal.js-4.4.0
 	cd $@ && \
 		npm install && npm add node-jq decktape gulp
 	# workarounds for the new reveal-js release