From 5c3cdafe3fc04dd5d9493487d3c323b56b28bf17 Mon Sep 17 00:00:00 2001 From: GilbN Date: Fri, 1 Apr 2022 23:54:31 +0200 Subject: [PATCH 01/10] fix: :bug: Landing page: CSS fix for Firefox --- resources/landing-page/css/custom.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/landing-page/css/custom.css b/resources/landing-page/css/custom.css index a2f04186..26b2a5c8 100644 --- a/resources/landing-page/css/custom.css +++ b/resources/landing-page/css/custom.css @@ -66,11 +66,10 @@ section { /* slightly transparent fallback for Firefox (not supporting backdrop-filter) */ @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { - #mainNav, #mainNav.navbar-scrolled { box-shadow: none; - background-color: rgba(0, 0, 0, 0.9); + background-color: rgba(var(--accent-color), 1); } } #mainNav .navbar-nav .nav-item .nav-link { @@ -83,6 +82,11 @@ section { opacity: .8; } @media (min-width: 992px) { + @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) { + #mainNav { + background-color: rgba(var(--accent-color), 0.95) !important; + } + } #mainNav { box-shadow: none; background-color: rgba(var(--accent-color), 0.25); From c482703486aa4129e63cb406f0be5a0303b38e70 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 16:15:28 +0200 Subject: [PATCH 02/10] Merge tag 'testing' into develop --- .github/workflows/docker-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 65817d57..e45e1dfc 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -37,15 +37,15 @@ jobs: run: | ARCHITECTURE=${{ matrix.architecture }} echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') - echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//} + echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${{ github.ref_name }} echo ::set-output name=revision::${GITHUB_SHA} - echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${GITHUB_REF//refs\/heads\//} + echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }} echo ::set-output name=vendor::${{ github.repository_owner }} echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md echo ::set-output name=VERSION::${{ github.event.release.tag_name }} echo ::set-output name=platform::${ARCHITECTURE//-/\/} - echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-cache-${{ matrix.architecture }} - echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }} + echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }} + echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }} - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -122,7 +122,7 @@ jobs: DOCKER_CLI_EXPERIMENTAL: enabled run: | IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} - TAG=${GITHUB_REF//refs\/heads\//} + TAG=${{ github.ref_name }} SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} VERSION=${{ steps.prep.outputs.VERSION }} [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 From d6ee8cbea78e677d6b884dee382adae4acd8bd76 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 16:34:13 +0200 Subject: [PATCH 03/10] make latest tag on relese --- .github/workflows/docker-build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e45e1dfc..0327b5b3 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -135,10 +135,8 @@ jobs: docker manifest push ${IMAGE}:${TAG}-${VERSION//\~/-} docker manifest create ${IMAGE}:${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:${VERSION//\~/-} + docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} + docker manifest push ${IMAGE}:latest fi docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} - if [[ ${TAG} == master ]]; then - docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:latest - fi \ No newline at end of file + docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} \ No newline at end of file From a69c3f185590d9e3cf009ee180f44115e4afca41 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 16:43:03 +0200 Subject: [PATCH 04/10] Manifest fixes --- .github/workflows/docker-build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0327b5b3..1d9af442 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -85,7 +85,7 @@ jobs: org.opencontainers.image.source=${{ steps.prep.outputs.source }} org.opencontainers.image.vendor=${{ steps.prep.outputs.vendor }} org.opencontainers.image.url=${{ steps.prep.outputs.url }} - org.opencontainers.image.version=${{ steps.prep.outputs.version }} + org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }} build-args: | TP_RELEASE=${{ steps.prep.outputs.VERSION }} BUILD_DATE=${{ steps.date_time.outputs.created }} @@ -130,11 +130,7 @@ jobs: [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:${TAG} - if [[! -z "${VERSION}" ]]; then - docker manifest create ${IMAGE}:${TAG}-${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${TAG}-${VERSION//\~/-} - docker manifest create ${IMAGE}:${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${VERSION//\~/-} + if [[ ${VERSION} ]]; then docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:latest fi From 3d2597f5e1155d975a4e992540c03ffcf7c19e0a Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 16:54:26 +0200 Subject: [PATCH 05/10] more fixes --- .github/workflows/docker-build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 1d9af442..2ced0e84 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -46,6 +46,7 @@ jobs: echo ::set-output name=platform::${ARCHITECTURE//-/\/} echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }} echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }} + echo ::set-output name=release::${{ github.event.release.target_commitish }} - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -125,14 +126,15 @@ jobs: TAG=${{ github.ref_name }} SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} VERSION=${{ steps.prep.outputs.VERSION }} + RELEASE=${{ steps.prep.outputs.release }} [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:${TAG} - if [[ ${VERSION} ]]; then + docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7} + docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} + if [[ ${RELEASE} == master ]]; then docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:latest - fi - docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} \ No newline at end of file + fi \ No newline at end of file From 849261e722eb77a2b2ff13f6927195ab92151646 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 17:05:43 +0200 Subject: [PATCH 06/10] hmmm --- .github/workflows/docker-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 2ced0e84..12db77ee 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -127,6 +127,7 @@ jobs: SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} VERSION=${{ steps.prep.outputs.VERSION }} RELEASE=${{ steps.prep.outputs.release }} + echo $RELEASE $TAG [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 @@ -134,7 +135,7 @@ jobs: docker manifest push ${IMAGE}:${TAG} docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} - if [[ ${RELEASE} == master ]]; then + if [[ ${RELEASE} == 'master' ]]; then docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:latest fi \ No newline at end of file From 13bfade18b38ac898d89fe7b0dbb4723bd4198e9 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 17:20:09 +0200 Subject: [PATCH 07/10] hmmm2 --- .github/workflows/docker-build.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 12db77ee..abb768ee 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -126,16 +126,18 @@ jobs: TAG=${{ github.ref_name }} SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} VERSION=${{ steps.prep.outputs.VERSION }} - RELEASE=${{ steps.prep.outputs.release }} - echo $RELEASE $TAG [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${TAG} + docker manifest push ${IMAGE}:${TAG} docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} - if [[ ${RELEASE} == 'master' ]]; then + docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} + - name: Latest manifest + if: ${{ github.event.release.target_commitish == 'master' }} + env: + DOCKER_CLI_EXPERIMENTAL: enabled + run: | + IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} - docker manifest push ${IMAGE}:latest - fi \ No newline at end of file + docker manifest push ${IMAGE}:latest From 78176e938cc02ccba8e5eaaa0e09d85704283b32 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 17:25:29 +0200 Subject: [PATCH 08/10] fix --- .github/workflows/docker-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index abb768ee..c65237d8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -139,5 +139,8 @@ jobs: DOCKER_CLI_EXPERIMENTAL: enabled run: | IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} + [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 + [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 + [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:latest From 3dc4677867c6e67499fdee64572800073966ab24 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 17:31:16 +0200 Subject: [PATCH 09/10] var fix --- .github/workflows/docker-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c65237d8..2a08b4fa 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -139,8 +139,9 @@ jobs: DOCKER_CLI_EXPERIMENTAL: enabled run: | IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} - [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 - [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 + SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} + [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 + [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64 [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7 docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7} docker manifest push ${IMAGE}:latest From f527a82d0de08adf50e5108fcd56003b730aa9b6 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sun, 3 Apr 2022 17:34:18 +0200 Subject: [PATCH 10/10] var fix 2 --- .github/workflows/docker-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 2a08b4fa..fdf4a016 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -139,6 +139,7 @@ jobs: DOCKER_CLI_EXPERIMENTAL: enabled run: | IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,} + TAG=${{ github.ref_name }} SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER} [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64 [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64