diff --git a/.gitignore b/.gitignore index 185e13f6f7a50eaa1f9b8598d3751d666237975f..9be9ac7e1dd6b027ac6173954ba129d79c1b63c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .idea/ archive/ +/.ahoy.l3d +/.ahoy.yml +/.env diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20b32c9cc2f64acc5f5713eb13d3b8beda435fce..8643bea4e5973962a1c9688bb80fb36c72f973cc 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 5392d5857b028c65ce92fc93af0888e6d438e6ef..b878fd3fc731ea2e71e0702355914aca9eeeb896 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ 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 diff --git a/bin/mdshow b/bin/mdshow index 53913e28378267fe8a62c14de092cd930a369e3b..d9ba432142e10905a8650ba0a9a7965abe4be506 100755 --- a/bin/mdshow +++ b/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