Merge remote-tracking branch 'origin/topic/awelzel/tweak-repo-urls'

* origin/topic/awelzel/tweak-repo-urls: docker: Use Debian_12, not Debian_Testing
corelight · Jul 10, 2023 · b4e44d7 · b4e44d7
2 parents 6320e7c + 45067f1
commit b4e44d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/docker/debian-bookworm-lts.Dockerfile b/docker/debian-bookworm-lts.Dockerfile
@@ -13,8 +13,10 @@ RUN apt update && apt install -y --no-install-recommends \
 # Cache busting
 ARG STAMP=1681753750
 
-RUN curl -fsSL https://download.opensuse.org/repositories/security:zeek/Debian_Testing/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
-RUN echo 'deb http://download.opensuse.org/repositories/security:/zeek/Debian_Testing/ /' | tee /etc/apt/sources.list.d/security:zeek.list && apt update
+ENV REPO_DISTRO=Debian_12
+
+RUN curl -fsSL https://download.opensuse.org/repositories/security:zeek/${REPO_DISTRO}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
+RUN echo "deb http://download.opensuse.org/repositories/security:/zeek/${REPO_DISTRO}/ /" | tee /etc/apt/sources.list.d/security:zeek.list && apt update
 
 RUN apt install -y --no-install-recommends \
 	zeek-lts-btest \

diff --git a/docker/debian-bookworm.Dockerfile b/docker/debian-bookworm.Dockerfile
@@ -10,8 +10,10 @@ RUN apt update && apt install -y --no-install-recommends \
     libnode-dev \
     python3
 
-RUN curl -fsSL https://download.opensuse.org/repositories/security:zeek/Debian_Testing/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
-RUN echo 'deb http://download.opensuse.org/repositories/security:/zeek/Debian_Testing/ /' | tee /etc/apt/sources.list.d/security:zeek.list && apt update
+ENV REPO_DISTRO=Debian_12
+
+RUN curl -fsSL https://download.opensuse.org/repositories/security:zeek/${REPO_DISTRO}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
+RUN echo "deb http://download.opensuse.org/repositories/security:/zeek/${REPO_DISTRO}/ /" | tee /etc/apt/sources.list.d/security:zeek.list && apt update
 
 RUN apt install -y --no-install-recommends \
 	zeek-btest \