Bot Updating Templated Files

LinuxServer-CI · LinuxServer-CI · commit 5c0e30b1c78a · 2019-03-07T04:44:41.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
             script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
-            script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
+            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
             returnStdout: true).trim()
           env.GITHUB_DATE = sh(
             script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
@@ -284,6 +284,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh '''docker rmi \
+                    ${IMAGE}:arm32v6-${META_TAG} \
+                    lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''
             }
           }
         }
@@ -310,6 +313,9 @@ pipeline {
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
               sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh '''docker rmi \
+                    ${IMAGE}:arm64v8-${META_TAG} \
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
             }
           }
         }
@@ -339,7 +345,7 @@ pipeline {
                   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 > /tmp/package_versions.txt && \
+                  apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \
                   chmod 777 /tmp/package_versions.txt'
               fi
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
@@ -471,6 +477,10 @@ pipeline {
           sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development"
           sh "docker push ${IMAGE}:development"
           sh "docker push ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:${META_TAG} \
+                ${IMAGE}:development '''
+                
         }
       }
     }
@@ -518,6 +528,15 @@ pipeline {
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
           sh "docker manifest push --purge ${IMAGE}:development"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+          sh '''docker rmi \
+                ${IMAGE}:amd64-${META_TAG} \
+                ${IMAGE}:amd64-development \
+                ${IMAGE}:arm32v6-${META_TAG} \
+                ${IMAGE}:arm32v6-development \
+                ${IMAGE}:arm64v8-${META_TAG} \
+                ${IMAGE}:arm64v8-development \
+                lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
         }
       }
     }
@@ -578,6 +597,18 @@ pipeline {
         }
       }
     }
+    // If this is a Pull request send the CI link as a comment on it
+    stage('Pull Request Comment') {
+      when {
+        not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'CI', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
+        -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''
+      }
+    }
   }
   /* ######################
      Send status to Discord
diff --git a/README.md b/README.md
@@ -51,8 +51,8 @@ Here are some example snippets to help you get started creating a container.
 ```
 docker create \
   --name=duplicati \
-  -e PUID=1001 \
-  -e PGID=1001 \
+  -e PUID=1000 \
+  -e PGID=1000 \
   -e TZ=Europe/London \
   -p 8200:8200 \
   -v </path/to/appdata/config>:/config \
@@ -75,16 +75,15 @@ services:
     image: linuxserver/duplicati
     container_name: duplicati
     environment:
-      - PUID=1001
-      - PGID=1001
+      - PUID=1000
+      - PGID=1000
       - TZ=Europe/London
     volumes:
       - </path/to/appdata/config>:/config
       - </path/to/backups>:/backups
       - </path/to/source>:/source
     ports:
       - 8200:8200
-    mem_limit: 4096m
     restart: unless-stopped
 ```
 
@@ -95,8 +94,8 @@ Container images are configured using parameters passed at runtime (such as thos
 | Parameter | Function |
 | :----: | --- |
 | `-p 8200` | http gui |
-| `-e PUID=1001` | for UserID - see below for explanation |
-| `-e PGID=1001` | for GroupID - see below for explanation |
+| `-e PUID=1000` | for UserID - see below for explanation |
+| `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
 | `-v /config` | Contains all relevant configuration files. |
 | `-v /backups` | Path to store local backups. |
@@ -108,11 +107,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
 
 ```
   $ id username
-    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
+    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
 ```
 
 
@@ -146,9 +145,20 @@ Below are the instructions for updating containers:
 * Start the new container: `docker start duplicati`
 * You can also remove the old dangling images: `docker image prune`
 
+### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
+* Pull the latest image at its tag and replace it with the same env variables in one shot:
+  ```
+  docker run --rm \
+  -v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
+  --oneshot duplicati
+  ```
+* You can also remove the old dangling images: `docker image prune`
+
 ### Via Docker Compose
-* Update the image: `docker-compose pull linuxserver/duplicati`
-* Let compose update containers as necessary: `docker-compose up -d`
+* Update all images: `docker-compose pull`
+  * or update a single image: `docker-compose pull duplicati`
+* Let compose update all containers as necessary: `docker-compose up -d`
+  * or update a single container: `docker-compose up -d duplicati`
 * You can also remove the old dangling images: `docker image prune`
 
 ## Versions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pipeline {`
`40`	`40`	`script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases \| jq -r 'first(.[] \| select(.prerelease == true)) \| .tag_name' ''',`
`41`	`41`	`returnStdout: true).trim()`
`42`	`42`	`env.LS_RELEASE_NOTES = sh(`
`43`		`- script: '''git log -1 --pretty=%B \| sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',`
	`43`	`+ script: '''cat readme-vars.yml \| awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' \| sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',`
`44`	`44`	`returnStdout: true).trim()`
`45`	`45`	`env.GITHUB_DATE = sh(`
`46`	`46`	`script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',`
`@@ -284,6 +284,9 @@ pipeline {`
`284`	`284`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`285`	`285`	`sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
`286`	`286`	`sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`287`	`+ sh '''docker rmi \`
	`288`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`289`	`+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''`
`287`	`290`	`}`
`288`	`291`	`}`
`289`	`292`	`}`
`@@ -310,6 +313,9 @@ pipeline {`
`310`	`313`	`--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."`
`311`	`314`	`sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
`312`	`315`	`sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"`
	`316`	`+ sh '''docker rmi \`
	`317`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`318`	`+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''`
`313`	`319`	`}`
`314`	`320`	`}`
`315`	`321`	`}`
`@@ -339,7 +345,7 @@ pipeline {`
`339`	`345`	`chmod 777 /tmp/package_versions.txt'`
`340`	`346`	`elif [ "${DIST_IMAGE}" == "ubuntu" ]; then`
`341`	`347`	`docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\`
`342`		`- apt list -qq --installed > /tmp/package_versions.txt && \`
	`348`	`+ apt list -qq --installed \| cut -d" " -f1-2 > /tmp/package_versions.txt && \`
`343`	`349`	`chmod 777 /tmp/package_versions.txt'`
`344`	`350`	`fi`
`345`	`351`	`NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt \| cut -c1-8 )`
`@@ -471,6 +477,10 @@ pipeline {`
`471`	`477`	`sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development"`
`472`	`478`	`sh "docker push ${IMAGE}:development"`
`473`	`479`	`sh "docker push ${IMAGE}:${META_TAG}"`
	`480`	`+ sh '''docker rmi \`
	`481`	`+ ${IMAGE}:${META_TAG} \`
	`482`	`+ ${IMAGE}:development '''`
	`483`	`+`
`474`	`484`	`}`
`475`	`485`	`}`
`476`	`486`	`}`
`@@ -518,6 +528,15 @@ pipeline {`
`518`	`528`	`sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"`
`519`	`529`	`sh "docker manifest push --purge ${IMAGE}:development"`
`520`	`530`	`sh "docker manifest push --purge ${IMAGE}:${META_TAG}"`
	`531`	`+ sh '''docker rmi \`
	`532`	`+ ${IMAGE}:amd64-${META_TAG} \`
	`533`	`+ ${IMAGE}:amd64-development \`
	`534`	`+ ${IMAGE}:arm32v6-${META_TAG} \`
	`535`	`+ ${IMAGE}:arm32v6-development \`
	`536`	`+ ${IMAGE}:arm64v8-${META_TAG} \`
	`537`	`+ ${IMAGE}:arm64v8-development \`
	`538`	`+ lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \`
	`539`	`+ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''`
`521`	`540`	`}`
`522`	`541`	`}`
`523`	`542`	`}`
`@@ -578,6 +597,18 @@ pipeline {`
`578`	`597`	`}`
`579`	`598`	`}`
`580`	`599`	`}`
	`600`	`+ // If this is a Pull request send the CI link as a comment on it`
	`601`	`+ stage('Pull Request Comment') {`
	`602`	`+ when {`
	`603`	`+ not {environment name: 'CHANGE_ID', value: ''}`
	`604`	`+ environment name: 'CI', value: 'true'`
	`605`	`+ environment name: 'EXIT_STATUS', value: ''`
	`606`	`+ }`
	`607`	`+ steps {`
	`608`	`+ sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \`
	`609`	`+ -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''`
	`610`	`+ }`
	`611`	`+ }`
`581`	`612`	`}`
`582`	`613`	`/* ######################`
`583`	`614`	`Send status to Discord`