Merge pull request #81 from linuxserver/debianbookworm-repos

bookworm: update repos and jenkins-vars
linuxserver · Aug 27, 2024 · 2d5b39a · 2d5b39a
2 parents 04976e9 + c594728
commit 2d5b39a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -247,12 +247,8 @@ RUN \
     '/locale/d' \
     /etc/dpkg/dpkg.cfg.d/docker && \
   echo "**** install deps ****" && \
-  apt-get update && \
-  apt-get install -y \
-    gnupg && \
-  curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
-  echo "deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable" > \
-    /etc/apt/sources.list.d/docker.list && \
+  curl -fsSL https://download.docker.com/linux/debian/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
+  echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -251,12 +251,8 @@ RUN \
     '/locale/d' \
     /etc/dpkg/dpkg.cfg.d/docker && \
   echo "**** install deps ****" && \
-  apt-get update && \
-  apt-get install -y \
-    gnupg && \
-  curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
-  echo "deb [arch=arm64] https://download.docker.com/linux/debian bookworm stable" > \
-    /etc/apt/sources.list.d/docker.list && \
+  curl -fsSL https://download.docker.com/linux/debian/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
+  echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
     CI_SSL='false'
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='username:password'
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -23,5 +23,5 @@ repo_vars:
   - CI_SSL='false'
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='username:password'
+  - CI_AUTH=''
   - CI_WEBPATH=''