Compare commits

..

No commits in common. "master" and "4.2.0-ls118" have entirely different histories.

3 changed files with 49 additions and 51 deletions

8
Jenkinsfile vendored
View File

@ -343,11 +343,9 @@ pipeline {
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
cd ${TEMPDIR}/unraid/templates/ cd ${TEMPDIR}/unraid/templates/
if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
echo "Image is on the ignore list, marking Unraid template as deprecated" echo "Image is on the ignore list, removing Unraid template"
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git rm unraid/${CONTAINER_NAME}.xml || :
git add -u unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Removing Deprecated Unraid Template' || :
git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
git commit -m 'Bot Moving Deprecated Unraid Template' || :
else else
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
git add unraid/${CONTAINER_NAME}.xml git add unraid/${CONTAINER_NAME}.xml

View File

@ -52,27 +52,27 @@ Find us at:
## Supported Architectures ## Supported Architectures
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
Simply pulling `lscr.io/linuxserver/code-server:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. Simply pulling `lscr.io/linuxserver/code-server` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
The architectures supported by this image are: The architectures supported by this image are:
| Architecture | Available | Tag | | Architecture | Tag |
| :----: | :----: | ---- | | :----: | --- |
| x86-64 | ✅ | amd64-\<version tag\> | | x86-64 | amd64-latest |
| arm64 | ✅ | arm64v8-\<version tag\> | | arm64 | arm64v8-latest |
| armhf| ✅ | arm32v7-\<version tag\> | | armhf | arm32v7-latest |
## Version Tags ## Version Tags
This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
| Tag | Available | Description | | Tag | Description |
| :----: | :----: |--- | | :----: | --- |
| latest | ✅ | Stable releases | | latest | Stable releases |
| focal | ✅ | DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal | | focal | DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal |
| development | ✅ | DEPRECATED (no longer updated) - Prereleases from their GitHub | | development | DEPRECATED (no longer updated) - Prereleases from their GitHub |
## Application Setup ## Application Setup
@ -100,7 +100,7 @@ Here are some example snippets to help you get started creating a container.
version: "2.1" version: "2.1"
services: services:
code-server: code-server:
image: lscr.io/linuxserver/code-server:latest image: lscr.io/linuxserver/code-server
container_name: code-server container_name: code-server
environment: environment:
- PUID=1000 - PUID=1000
@ -136,7 +136,7 @@ docker run -d \
-p 8443:8443 \ -p 8443:8443 \
-v /path/to/appdata/config:/config \ -v /path/to/appdata/config:/config \
--restart unless-stopped \ --restart unless-stopped \
lscr.io/linuxserver/code-server:latest lscr.io/linuxserver/code-server
``` ```
## Parameters ## Parameters
@ -200,7 +200,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
* container version number * container version number
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' code-server` * `docker inspect -f '{{ index .Config.Labels "build_version" }}' code-server`
* image version number * image version number
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/code-server:latest` * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/code-server`
## Updating Info ## Updating Info
@ -218,7 +218,7 @@ Below are the instructions for updating containers:
### Via Docker Run ### Via Docker Run
* Update the image: `docker pull lscr.io/linuxserver/code-server:latest` * Update the image: `docker pull lscr.io/linuxserver/code-server`
* Stop the running container: `docker stop code-server` * Stop the running container: `docker stop code-server`
* Delete the container: `docker rm code-server` * Delete the container: `docker rm code-server`
* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)

View File

@ -1,36 +1,36 @@
adduser3.118ubuntu2 adduser3.118ubuntu2
apt2.0.9 apt2.0.6
apt-utils2.0.9 apt-utils2.0.6
base-files11ubuntu5.5 base-files11ubuntu5.5
base-passwd3.5.47 base-passwd3.5.47
bash5.0-6ubuntu1.1 bash5.0-6ubuntu1.1
bsdutils1:2.34-0.1ubuntu9.3 bsdutils1:2.34-0.1ubuntu9.3
bzip21.0.8-2 bzip21.0.8-2
ca-certificates20211016~20.04.1 ca-certificates20210119~20.04.2
coreutils8.30-3ubuntu2 coreutils8.30-3ubuntu2
curl7.68.0-1ubuntu2.12 curl7.68.0-1ubuntu2.7
dash0.5.10.2-6 dash0.5.10.2-6
debconf1.5.73 debconf1.5.73
debianutils4.9.1 debianutils4.9.1
diffutils1:3.7-3 diffutils1:3.7-3
dirmngr2.2.19-3ubuntu2.2 dirmngr2.2.19-3ubuntu2.1
dpkg1.19.7ubuntu3 dpkg1.19.7ubuntu3
e2fsprogs1.45.5-2ubuntu1 e2fsprogs1.45.5-2ubuntu1
fdisk2.34-0.1ubuntu9.3 fdisk2.34-0.1ubuntu9.3
findutils4.7.0-1ubuntu1 findutils4.7.0-1ubuntu1
gcc-10-base10.3.0-1ubuntu1~20.04 gcc-10-base10.3.0-1ubuntu1~20.04
git1:2.25.1-1ubuntu3.5 git1:2.25.1-1ubuntu3.2
git-man1:2.25.1-1ubuntu3.5 git-man1:2.25.1-1ubuntu3.2
gnupg2.2.19-3ubuntu2.2 gnupg2.2.19-3ubuntu2.1
gnupg-l10n2.2.19-3ubuntu2.2 gnupg-l10n2.2.19-3ubuntu2.1
gnupg-utils2.2.19-3ubuntu2.2 gnupg-utils2.2.19-3ubuntu2.1
gpg2.2.19-3ubuntu2.2 gpg2.2.19-3ubuntu2.1
gpg-agent2.2.19-3ubuntu2.2 gpg-agent2.2.19-3ubuntu2.1
gpgconf2.2.19-3ubuntu2.2 gpgconf2.2.19-3ubuntu2.1
gpgsm2.2.19-3ubuntu2.2 gpgsm2.2.19-3ubuntu2.1
gpgv2.2.19-3ubuntu2.2 gpgv2.2.19-3ubuntu2.1
gpg-wks-client2.2.19-3ubuntu2.2 gpg-wks-client2.2.19-3ubuntu2.1
gpg-wks-server2.2.19-3ubuntu2.2 gpg-wks-server2.2.19-3ubuntu2.1
grep3.4-1 grep3.4-1
gzip1.10-0ubuntu4 gzip1.10-0ubuntu4
hostname3.23 hostname3.23
@ -39,7 +39,7 @@ jq1.6-1ubuntu0.20.04.1
krb5-locales1.17-6ubuntu4.1 krb5-locales1.17-6ubuntu4.1
less551-1ubuntu0.1 less551-1ubuntu0.1
libacl12.2.53-6 libacl12.2.53-6
libapt-pkg6.02.0.9 libapt-pkg6.02.0.6
libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
libassuan02.5.3-7ubuntu2 libassuan02.5.3-7ubuntu2
libatomic110.3.0-1ubuntu1~20.04 libatomic110.3.0-1ubuntu1~20.04
@ -50,14 +50,14 @@ libblkid12.34-0.1ubuntu9.3
libbrotli11.0.7-6ubuntu0.1 libbrotli11.0.7-6ubuntu0.1
libbsd00.10.0-1 libbsd00.10.0-1
libbz2-1.01.0.8-2 libbz2-1.01.0.8-2
libc62.31-0ubuntu9.9 libc62.31-0ubuntu9.7
libcap-ng00.7.9-2.1build1 libcap-ng00.7.9-2.1build1
libc-bin2.31-0ubuntu9.7 libc-bin2.31-0ubuntu9.7
libcbor0.60.6.0-0ubuntu1 libcbor0.60.6.0-0ubuntu1
libcom-err21.45.5-2ubuntu1 libcom-err21.45.5-2ubuntu1
libcrypt11:4.4.10-10ubuntu4 libcrypt11:4.4.10-10ubuntu4
libcurl3-gnutls7.68.0-1ubuntu2.12 libcurl3-gnutls7.68.0-1ubuntu2.7
libcurl47.68.0-1ubuntu2.12 libcurl47.68.0-1ubuntu2.7
libdb5.35.3.28+dfsg1-0.6ubuntu2 libdb5.35.3.28+dfsg1-0.6ubuntu2
libdebconfclient00.251ubuntu1 libdebconfclient00.251ubuntu1
libedit23.1-20191231-1 libedit23.1-20191231-1
@ -84,13 +84,13 @@ libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
libidn2-02.2.0-2 libidn2-02.2.0-2
libjq11.6-1ubuntu0.20.04.1 libjq11.6-1ubuntu0.20.04.1
libk5crypto31.17-6ubuntu4.1 libk5crypto31.17-6ubuntu4.1
libkeyutils11.6-6ubuntu1.1 libkeyutils11.6-6ubuntu1
libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
libkrb5-31.17-6ubuntu4.1 libkrb5-31.17-6ubuntu4.1
libkrb5support01.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1
libksba81.3.5-2 libksba81.3.5-2
libldap-2.4-22.4.49+dfsg-2ubuntu1.9 libldap-2.4-22.4.49+dfsg-2ubuntu1.8
libldap-common2.4.49+dfsg-2ubuntu1.9 libldap-common2.4.49+dfsg-2ubuntu1.8
liblz4-11.9.2-2ubuntu0.20.04.1 liblz4-11.9.2-2ubuntu0.20.04.1
liblzma55.2.4-1ubuntu1 liblzma55.2.4-1ubuntu1
libmount12.34-0.1ubuntu9.3 libmount12.34-0.1ubuntu9.3
@ -122,10 +122,10 @@ libsemanage13.0-1build2
libsemanage-common3.0-1build2 libsemanage-common3.0-1build2
libsepol13.0-1 libsepol13.0-1
libsmartcols12.34-0.1ubuntu9.3 libsmartcols12.34-0.1ubuntu9.3
libsqlite3-03.31.1-4ubuntu0.3 libsqlite3-03.31.1-4ubuntu0.2
libss21.45.5-2ubuntu1 libss21.45.5-2ubuntu1
libssh-40.9.3-2ubuntu2.2 libssh-40.9.3-2ubuntu2.2
libssl1.11.1.1f-1ubuntu2.16 libssl1.11.1.1f-1ubuntu2.12
libstdc++610.3.0-1ubuntu1~20.04 libstdc++610.3.0-1ubuntu1~20.04
libsystemd0245.4-4ubuntu3.15 libsystemd0245.4-4ubuntu3.15
libtasn1-64.16.0-2 libtasn1-64.16.0-2
@ -142,7 +142,7 @@ libxdmcp61:1.1.3-0ubuntu1
libxext62:1.3.4-0ubuntu1 libxext62:1.3.4-0ubuntu1
libxmuu12:1.1.3-0ubuntu1 libxmuu12:1.1.3-0ubuntu1
libzstd11.4.4+dfsg-3ubuntu0.1 libzstd11.4.4+dfsg-3ubuntu0.1
locales2.31-0ubuntu9.9 locales2.31-0ubuntu9.7
login1:4.8.1-1ubuntu5.20.04.1 login1:4.8.1-1ubuntu5.20.04.1
logsave1.45.5-2ubuntu1 logsave1.45.5-2ubuntu1
lsb-base11.1.0ubuntu2 lsb-base11.1.0ubuntu2
@ -153,8 +153,8 @@ ncurses-base6.2-0ubuntu2
ncurses-bin6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2
netbase6.1 netbase6.1
net-tools1.60+git20180626.aebd88e-1ubuntu1 net-tools1.60+git20180626.aebd88e-1ubuntu1
openssh-client1:8.2p1-4ubuntu0.5 openssh-client1:8.2p1-4ubuntu0.4
openssl1.1.1f-1ubuntu2.16 openssl1.1.1f-1ubuntu2.12
passwd1:4.8.1-1ubuntu5.20.04.1 passwd1:4.8.1-1ubuntu5.20.04.1
patch2.7.6-6 patch2.7.6-6
perl5.30.0-9ubuntu0.2 perl5.30.0-9ubuntu0.2