removing uneeded block logic for meta tagging the docker endpoints from the JenkinsFile

Merge pull request #10 from linuxserver/pipeline
Pipeline
2026-04-10 13:02:22 +09:00 · 2018-10-05 23:14:54 -07:00 · 2018-10-05 17:29:04 -04:00 · 2018-10-05 14:09:25 -07:00 · 2018-10-05 13:55:08 -07:00
1 changed files with 2 additions and 5 deletions
--- a/7
+++ b/7
@@ -113,9 +113,6 @@ pipeline {
    stage("Set ENV live build"){
      when {
        branch "master"
-        expression {
-          env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
-        }
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -356,11 +353,11 @@ pipeline {
          sh "docker manifest push --purge ${IMAGE}:latest || :"
          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest"
          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant armv8"
+          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
          sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :"
          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant armv8"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
          sh "docker manifest push --purge ${IMAGE}:latest"
          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
        }
Author	SHA1	Message	Date
thelamer	7c3bb91996	removing uneeded block logic for meta tagging the docker endpoints from the JenkinsFile	2018-10-05 23:14:54 -07:00
aptalca	296e912007	Merge pull request #10 from linuxserver/pipeline Pipeline	2018-10-05 17:29:04 -04:00
thelamer	918f8595f4	missed the latest tag for the arm64 manifest tag	2018-10-05 14:09:25 -07:00
thelamer	6a66ca1514	modifying the manifest variant tagging to match other docker images	2018-10-05 13:55:08 -07:00