Compare commits

..

4 Commits

Author SHA1 Message Date
aptalca
684c6b645d Merge pull request #27 from linuxserver/start
Update start arguments
2020-04-29 19:58:24 -04:00
aptalca
1ab135cd82 Update start arguments 2020-04-29 18:45:31 -04:00
LinuxServer-CI
0f3500e097 Bot Updating Templated Files 2020-04-29 22:16:51 +00:00
LinuxServer-CI
364e6a0585 Bot Updating Package Versions 2020-04-26 05:16:39 -04:00
6 changed files with 82 additions and 70 deletions

1
.github/FUNDING.yml vendored
View File

@@ -1 +1,2 @@
github: linuxserver
open_collective: linuxserver open_collective: linuxserver

10
Jenkinsfile vendored
View File

@@ -357,7 +357,9 @@ pipeline {
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
retry(5) {
sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
}
sh '''docker rmi \ sh '''docker rmi \
${IMAGE}:arm32v7-${META_TAG} \ ${IMAGE}:arm32v7-${META_TAG} \
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -384,7 +386,9 @@ pipeline {
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." --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 tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
retry(5) {
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
}
sh '''docker rmi \ sh '''docker rmi \
${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-${META_TAG} \
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -549,6 +553,7 @@ pipeline {
passwordVariable: 'QUAYPASS' passwordVariable: 'QUAYPASS'
] ]
]) { ]) {
retry(5) {
sh '''#! /bin/bash sh '''#! /bin/bash
set -e set -e
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -561,6 +566,9 @@ pipeline {
docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:latest
docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${META_TAG}
done done
'''
}
sh '''#! /bin/bash
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
docker rmi \ docker rmi \
${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${META_TAG} \
@@ -591,6 +599,7 @@ pipeline {
passwordVariable: 'QUAYPASS' passwordVariable: 'QUAYPASS'
] ]
]) { ]) {
retry(5) {
sh '''#! /bin/bash sh '''#! /bin/bash
set -e set -e
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -644,6 +653,7 @@ pipeline {
docker push ${LEGACYIMAGE}:arm64v8-latest docker push ${LEGACYIMAGE}:arm64v8-latest
done done
''' '''
}
sh '''#! /bin/bash sh '''#! /bin/bash
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker rmi \ docker rmi \

View File

@@ -234,6 +234,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **29.04.20:** - Update start arguments.
* **01.04.20:** - Structural changes required for v3. * **01.04.20:** - Structural changes required for v3.
* **17.01.20:** - Fix artifact url retrieval from github. * **17.01.20:** - Fix artifact url retrieval from github.
* **24.10.19:** - Upgrade to v2 builds. * **24.10.19:** - Upgrade to v2 builds.

View File

@@ -18,8 +18,8 @@ e2fsprogs1.44.1-1ubuntu1.3
fdisk2.31.1-0.4ubuntu3.6 fdisk2.31.1-0.4ubuntu3.6
findutils4.6.0+git+20170828-2 findutils4.6.0+git+20170828-2
gcc-8-base8.4.0-1ubuntu1~18.04 gcc-8-base8.4.0-1ubuntu1~18.04
git1:2.17.1-1ubuntu0.6 git1:2.17.1-1ubuntu0.7
git-man1:2.17.1-1ubuntu0.6 git-man1:2.17.1-1ubuntu0.7
gpgv2.2.4-1ubuntu1.2 gpgv2.2.4-1ubuntu1.2
grep3.1-2build1 grep3.1-2build1
gzip1.6-5ubuntu1 gzip1.6-5ubuntu1

View File

@@ -65,6 +65,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "29.04.20:", desc: "Update start arguments." }
- { date: "01.04.20:", desc: "Structural changes required for v3." } - { date: "01.04.20:", desc: "Structural changes required for v3." }
- { date: "17.01.20:", desc: "Fix artifact url retrieval from github." } - { date: "17.01.20:", desc: "Fix artifact url retrieval from github." }
- { date: "24.10.19:", desc: "Upgrade to v2 builds." } - { date: "24.10.19:", desc: "Upgrade to v2 builds." }

View File

@@ -10,8 +10,7 @@ fi
exec \ exec \
s6-setuidgid abc \ s6-setuidgid abc \
/app/code-server/code-server \ /app/code-server/code-server \
--host 0.0.0.0 \ --bind-addr 0.0.0.0:8443 \
--port 8443 \
--user-data-dir /config/data \ --user-data-dir /config/data \
--extensions-dir /config/extensions \ --extensions-dir /config/extensions \
--disable-telemetry \ --disable-telemetry \