diff --git a/Dockerfile b/Dockerfile index 8219691..0b2cb7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN \ /root-out/var/log/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.5.0" +ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay @@ -105,6 +105,7 @@ RUN \ > /run/systemd/container && \ echo "**** install apt-utils and locales ****" && \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y \ apt-utils \ locales && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c788e0d..bac994a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -27,7 +27,7 @@ RUN \ /root-out/var/log/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.5.0" +ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay @@ -105,6 +105,7 @@ RUN \ > /run/systemd/container && \ echo "**** install apt-utils and locales ****" && \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y \ apt-utils \ locales && \ diff --git a/Jenkinsfile b/Jenkinsfile index 64cf4c0..cc6e107 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -837,7 +837,7 @@ pipeline { "target_commitish": "jammy",\ "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": true}' >> releasebody.json + printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a373adf..85d4616 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-baseimage-ubuntu external_type: os -release_type: prerelease +release_type: stable release_tag: jammy ls_branch: jammy repo_vars: