Bot Updating Templated Files

linuxserver · Mar 4, 2023 · 5d9b266 · 5d9b266
1 parent 6a0bdcd
commit 5d9b266
Showing 1 changed file with 18 additions and 28 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -446,7 +446,8 @@ pipeline {
  }
  steps {
  echo "Running on node: ${NODE_NAME}"
- sh "docker build \
+ sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+ sh "docker buildx build \
  --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
  --label \"org.opencontainers.image.authors=linuxserver.io\" \
  --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-darktable/packages\" \
@@ -459,7 +460,7 @@ pipeline {
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Darktable\" \
  --label \"org.opencontainers.image.description=[darktable](https://www.darktable.org/) is an open source photography workflow application and raw developer. A virtual lighttable and darkroom for photographers. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.\" \
- --no-cache --pull -t ${IMAGE}:${META_TAG} \
+ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
  }
@@ -476,7 +477,8 @@ pipeline {
  stage('Build X86') {
  steps {
  echo "Running on node: ${NODE_NAME}"
- sh "docker build \
+ sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+ sh "docker buildx build \
  --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
  --label \"org.opencontainers.image.authors=linuxserver.io\" \
  --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-darktable/packages\" \
@@ -489,7 +491,7 @@ pipeline {
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Darktable\" \
  --label \"org.opencontainers.image.description=[darktable](https://www.darktable.org/) is an open source photography workflow application and raw developer. A virtual lighttable and darkroom for photographers. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.\" \
- --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
+ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
  }
@@ -503,7 +505,8 @@ pipeline {
  sh '''#! /bin/bash
  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
  '''
- sh "docker build \
+ sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
+ sh "docker buildx build \
  --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
  --label \"org.opencontainers.image.authors=linuxserver.io\" \
  --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-darktable/packages\" \
@@ -516,7 +519,7 @@ pipeline {
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Darktable\" \
  --label \"org.opencontainers.image.description=[darktable](https://www.darktable.org/) is an open source photography workflow application and raw developer. A virtual lighttable and darkroom for photographers. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.\" \
- --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+ --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
  retry(5) {
@@ -537,7 +540,8 @@ pipeline {
  sh '''#! /bin/bash
  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
  '''
- sh "docker build \
+ sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+ sh "docker buildx build \
  --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
  --label \"org.opencontainers.image.authors=linuxserver.io\" \
  --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-darktable/packages\" \
@@ -550,7 +554,7 @@ pipeline {
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Darktable\" \
  --label \"org.opencontainers.image.description=[darktable](https://www.darktable.org/) is an open source photography workflow application and raw developer. A virtual lighttable and darkroom for photographers. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.\" \
- --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
  --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) {
@@ -579,26 +583,12 @@ pipeline {
  else
  LOCAL_CONTAINER=${IMAGE}:${META_TAG}
  fi
- if [ "${DIST_IMAGE}" == "alpine" ]; then
- docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
- apk info -v > /tmp/package_versions.txt && \
- sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
- chmod 777 /tmp/package_versions.txt'
- elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
- docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
- apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
- sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
- chmod 777 /tmp/package_versions.txt'
- elif [ "${DIST_IMAGE}" == "fedora" ]; then
- docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
- rpm -qa > /tmp/package_versions.txt && \
- sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
- chmod 777 /tmp/package_versions.txt'
- elif [ "${DIST_IMAGE}" == "arch" ]; then
- docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
- pacman -Q > /tmp/package_versions.txt && \
- chmod 777 /tmp/package_versions.txt'
- fi
+ touch ${TEMPDIR}/package_versions.txt
+ docker run --rm \
+ -v /var/run/docker.sock:/var/run/docker.sock:ro \
+ -v ${TEMPDIR}:/tmp \
+ ghcr.io/anchore/syft:latest \
+ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
  NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
  echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
  if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then