Merge pull request #158 from linuxserver/jammy-upgrade

Run apt-get upgrade during build
pull/161/head
Adam 2024-03-19 15:53:52 +00:00 zatwierdzone przez GitHub
commit 567cc0a5ae
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
4 zmienionych plików z 6 dodań i 4 usunięć

Wyświetl plik

@ -27,7 +27,7 @@ RUN \
/root-out/var/log/* /root-out/var/log/*
# set version for s6 overlay # 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" ARG S6_OVERLAY_ARCH="x86_64"
# add s6 overlay # add s6 overlay
@ -105,6 +105,7 @@ RUN \
> /run/systemd/container && \ > /run/systemd/container && \
echo "**** install apt-utils and locales ****" && \ echo "**** install apt-utils and locales ****" && \
apt-get update && \ apt-get update && \
apt-get upgrade -y && \
apt-get install -y \ apt-get install -y \
apt-utils \ apt-utils \
locales && \ locales && \

Wyświetl plik

@ -27,7 +27,7 @@ RUN \
/root-out/var/log/* /root-out/var/log/*
# set version for s6 overlay # 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" ARG S6_OVERLAY_ARCH="aarch64"
# add s6 overlay # add s6 overlay
@ -105,6 +105,7 @@ RUN \
> /run/systemd/container && \ > /run/systemd/container && \
echo "**** install apt-utils and locales ****" && \ echo "**** install apt-utils and locales ****" && \
apt-get update && \ apt-get update && \
apt-get upgrade -y && \
apt-get install -y \ apt-get install -y \
apt-utils \ apt-utils \
locales && \ locales && \

2
Jenkinsfile vendored
Wyświetl plik

@ -837,7 +837,7 @@ pipeline {
"target_commitish": "jammy",\ "target_commitish": "jammy",\
"name": "'${META_TAG}'",\ "name": "'${META_TAG}'",\
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start "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 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''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
} }

Wyświetl plik

@ -3,7 +3,7 @@
# jenkins variables # jenkins variables
project_name: docker-baseimage-ubuntu project_name: docker-baseimage-ubuntu
external_type: os external_type: os
release_type: prerelease release_type: stable
release_tag: jammy release_tag: jammy
ls_branch: jammy ls_branch: jammy
repo_vars: repo_vars: