diff --git a/Jenkinsfile b/Jenkinsfile
index 5072fbc..3a577c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -118,12 +118,11 @@ pipeline {
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
returnStdout: true).trim()
- env.SEMVER = (new Date()).format('YYYY.MM.dd')
- def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
+ def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
if (semver.find()) {
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
} else {
- semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
+ semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
if (semver.find()) {
if (semver[0][3]) {
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -133,7 +132,15 @@ pipeline {
}
}
- println("SEMVER: ${env.SEMVER}")
+ if (env.SEMVER != null) {
+ if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+ env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
+ }
+ println("SEMVER: ${env.SEMVER}")
+ } else {
+ println("No SEMVER detected")
+ }
+
}
}
}
@@ -402,10 +409,10 @@ pipeline {
steps{
sh '''#! /bin/bash
set -e
- PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/code-server") | .uuid')
+ PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/code-server") | .uuid')
if [ -z "${PACKAGE_UUID}" ]; then
echo "Adding package to Scarf.sh"
- PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
+ curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-H "Authorization: Bearer ${SCARF_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"name":"linuxserver/code-server",\
@@ -413,22 +420,10 @@ pipeline {
"libraryType":"docker",\
"website":"https://github.com/linuxserver/docker-code-server",\
"backendUrl":"https://ghcr.io/linuxserver/code-server",\
- "publicUrl":"https://lscr.io/linuxserver/code-server"}' \
- | jq -r .uuid)
+ "publicUrl":"https://lscr.io/linuxserver/code-server"}' || :
else
echo "Package already exists on Scarf.sh"
fi
- echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
- curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
- -H "Authorization: Bearer ${SCARF_TOKEN}" \
- -H "Content-Type: application/json" \
- -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
- {"userQuery":"roxedus","permissionLevel":"admin"},\
- {"userQuery":"nemchik","permissionLevel":"admin"},\
- {"userQuery":"driz","permissionLevel":"admin"},\
- {"userQuery":"aptalca","permissionLevel":"admin"},\
- {"userQuery":"saarg","permissionLevel":"admin"},\
- {"userQuery":"Stark","permissionLevel":"admin"}]'
'''
}
}
@@ -752,11 +747,15 @@ pipeline {
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:focal
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
- docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+ if [ -n "${SEMVER}" ]; then
+ docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+ fi
docker push ${PUSHIMAGE}:focal
docker push ${PUSHIMAGE}:${META_TAG}
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
- docker push ${PUSHIMAGE}:${SEMVER}
+ if [ -n "${SEMVER}" ]; then
+ docker push ${PUSHIMAGE}:${SEMVER}
+ fi
done
'''
}
@@ -765,8 +764,10 @@ pipeline {
docker rmi \
${DELETEIMAGE}:${META_TAG} \
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
- ${DELETEIMAGE}:focal \
- ${DELETEIMAGE}:${SEMVER} || :
+ ${DELETEIMAGE}:focal || :
+ if [ -n "${SEMVER}" ]; then
+ docker rmi ${DELETEIMAGE}:${SEMVER} || :
+ fi
done
'''
}
@@ -816,9 +817,11 @@ pipeline {
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
- docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
- docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
- docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+ if [ -n "${SEMVER}" ]; then
+ docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+ docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+ docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+ fi
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -828,9 +831,11 @@ pipeline {
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
- docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
- docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
- docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+ if [ -n "${SEMVER}" ]; then
+ docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+ docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+ docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+ fi
docker manifest push --purge ${MANIFESTIMAGE}:focal || :
docker manifest create ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:amd64-focal ${MANIFESTIMAGE}:arm32v7-focal ${MANIFESTIMAGE}:arm64v8-focal
docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm32v7-focal --os linux --arch arm
@@ -843,14 +848,18 @@ pipeline {
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
- docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --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}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+ docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+ docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+ fi
docker manifest push --purge ${MANIFESTIMAGE}:focal
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
+ if [ -n "${SEMVER}" ]; then
+ docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
+ fi
done
'''
}
@@ -860,15 +869,18 @@ pipeline {
${DELETEIMAGE}:amd64-${META_TAG} \
${DELETEIMAGE}:amd64-focal \
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
- ${DELETEIMAGE}:amd64-${SEMVER} \
${DELETEIMAGE}:arm32v7-${META_TAG} \
${DELETEIMAGE}:arm32v7-focal \
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
- ${DELETEIMAGE}:arm32v7-${SEMVER} \
${DELETEIMAGE}:arm64v8-${META_TAG} \
${DELETEIMAGE}:arm64v8-focal \
- ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
- ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+ ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
+ if [ -n "${SEMVER}" ]; then
+ docker rmi \
+ ${DELETEIMAGE}:amd64-${SEMVER} \
+ ${DELETEIMAGE}:arm32v7-${SEMVER} \
+ ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+ fi
done
docker rmi \
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
diff --git a/README.md b/README.md
index 8b02e0d..54670df 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Find us at:
# [linuxserver/code-server](https://github.com/linuxserver/docker-code-server)
+[](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fcode-server)
[](https://github.com/linuxserver/docker-code-server)
[](https://github.com/linuxserver/docker-code-server/releases)
[](https://github.com/linuxserver/docker-code-server/packages)
@@ -70,7 +71,7 @@ This image provides various versions that are available via tags. `latest` tag u
| Tag | Description |
| :----: | --- |
| latest | Stable releases |
-| focal | Stable releases, on a focal baseiamge |
+| focal | DEPRECATED - Stable releases, on a focal baseiamge |
## Application Setup
@@ -261,6 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
+* **19.01.21:** - Deprecate the focal tag.
* **12.07.21:** - Rebase to focal
* **11.07.21:** - Bump node to 14 to fix builds
* **08.05.21:** - Fix doc link
diff --git a/readme-vars.yml b/readme-vars.yml
index 36b9330..3c81fc9 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -19,10 +19,6 @@ project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is VS Code ru
- You're no longer running excess instances of Chrome."
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_deprecation_status: true
-project_deprecation_message: |
- latest tag is now based on Ubuntu Focal
-
# supported architectures
available_architectures:
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -33,7 +29,7 @@ available_architectures:
development_versions: true
development_versions_items:
- { tag: "latest", desc: "Stable releases" }
- - { tag: "focal", desc: "Stable releases, on a focal baseiamge" }
+ - { tag: "focal", desc: "DEPRECATED - Stable releases, on a focal baseiamge" }
# container parameters
common_param_env_vars_enabled: true
diff --git a/root/etc/cont-init.d/99-deprecation b/root/etc/cont-init.d/99-deprecation
new file mode 100644
index 0000000..81a9e6f
--- /dev/null
+++ b/root/etc/cont-init.d/99-deprecation
@@ -0,0 +1,20 @@
+#!/usr/bin/with-contenv bash
+
+echo '
+******************************************************
+******************************************************
+* *
+* *
+* This image tag is deprecated. *
+* We will not offer support for this tag *
+* and it will not be updated. *
+* *
+* *
+******************************************************
+******************************************************
+
+latest tag is now based on Ubuntu Focal
+
+
+******************************************************
+******************************************************'
\ No newline at end of file