Merge pull request #3 from linuxserver/320-rebase

rebase to Alpine 3.20
linuxserver · May 24, 2024 · 3b6f7e1 · 3b6f7e1
2 parents 43ffa98 + 900fd4c
commit 3b6f7e1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 35 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
 
 ARG GITQLIENT_RELEASE
 
@@ -27,7 +27,7 @@ RUN \
  make -j 4 && \
  make install
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
 
 # set version label
 ARG BUILD_DATE

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
 
 ARG GITQLIENT_RELEASE
 
@@ -27,7 +27,7 @@ RUN \
  make -j 4 && \
  make install
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
 
 # set version label
 ARG BUILD_DATE

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -305,7 +305,7 @@ pipeline {
  echo "Jenkinsfile is up to date."
  fi
  echo "Starting Stage 2 - Delete old templates"
- OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+ OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
  for i in ${OLD_TEMPLATES}; do
  if [[ -f "${i}" ]]; then
  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -535,6 +535,7 @@ pipeline {
  --label \"org.opencontainers.image.title=Gitqlient\" \
  --label \"org.opencontainers.image.description=[GitQlient](https://github.com/francescmm/GitQlient) is a multi-platform Git client originally forked from QGit. Nowadays it goes beyond of just a fork and adds a lot of new functionality.\" \
  --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+ --provenance=false --sbom=false \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
  }
@@ -566,6 +567,7 @@ pipeline {
  --label \"org.opencontainers.image.title=Gitqlient\" \
  --label \"org.opencontainers.image.description=[GitQlient](https://github.com/francescmm/GitQlient) is a multi-platform Git client originally forked from QGit. Nowadays it goes beyond of just a fork and adds a lot of new functionality.\" \
  --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+ --provenance=false --sbom=false \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
  }
@@ -594,6 +596,7 @@ pipeline {
  --label \"org.opencontainers.image.title=Gitqlient\" \
  --label \"org.opencontainers.image.description=[GitQlient](https://github.com/francescmm/GitQlient) is a multi-platform Git client originally forked from QGit. Nowadays it goes beyond of just a fork and adds a lot of new functionality.\" \
  --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+ --provenance=false --sbom=false \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
  retry(5) {
@@ -717,7 +720,7 @@ pipeline {
  --shm-size=1gb \
  -v /var/run/docker.sock:/var/run/docker.sock \
  -e IMAGE=\"${IMAGE}\" \
- -e DELAY_START=\"${CI_DELAY}\" \
+ -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
  -e TAGS=\"${CI_TAGS}\" \
  -e META_TAG=\"${META_TAG}\" \
  -e PORT=\"${CI_PORT}\" \
@@ -825,35 +828,13 @@ pipeline {
  docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
  docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
  fi
- docker manifest push --purge ${MANIFESTIMAGE}:latest || :
- docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
- docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
- docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
- docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
- docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
- docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
- docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
- docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
- if [ -n "${SEMVER}" ]; then
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
- docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
- fi
- token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
- digest=$(curl -s \
- --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
- --header "Authorization: Bearer ${token}" \
- "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
- if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
- docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
- docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
- docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
- fi
- docker manifest push --purge ${MANIFESTIMAGE}:latest
- docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
- docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+ done
+ for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
  if [ -n "${SEMVER}" ]; then
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
  fi
  done
  '''

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Find us at:
 
 # [linuxserver/gitqlient](https://github.com/linuxserver/docker-gitqlient)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fgitqlient?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fgitqlient)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fgitqlient?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-gitqlient.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-gitqlient)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-gitqlient.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-gitqlient/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-gitqlient/packages)
@@ -328,6 +328,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.05.24:** - Rebase to Alpine 3.20.
 * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
 * **21.01.24:** - Rebase to Alpine 3.19.
 * **02.04.23:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -90,6 +90,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+ - { date: "23.05.24:", desc: "Rebase to Alpine 3.20." }
  - { date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon." }
  - { date: "21.01.24:", desc: "Rebase to Alpine 3.19." }
  - { date: "02.04.23:", desc: "Initial release." }