osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/40660?usp=email )
Change subject: Use debian/eol:buster instead of debian:buster
......................................................................
Use debian/eol:buster instead of debian:buster
Change-Id: Ic960320dcc6c5e8d8cc4d0bdf7541da4b692e10e
---
M debian-buster-build/Dockerfile
M debian-buster-build/Makefile
M debian-buster-jenkins-arm/Makefile
M debian-buster-jenkins/Makefile
M debian-buster-obs-latest/Dockerfile
M debian-buster-obs-latest/Makefile
M debian10-obs-submit/Dockerfile
M jenkins-common.sh
8 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/60/40660/1
diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile
index 1059d3a..d629458 100644
--- a/debian-buster-build/Dockerfile
+++ b/debian-buster-build/Dockerfile
@@ -1,5 +1,5 @@
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:buster
+ARG UPSTREAM_DISTRO=debian/eol:buster
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org";
diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile
index 67066b3..8fd0302 100644
--- a/debian-buster-build/Makefile
+++ b/debian-buster-build/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO=debian:buster
+UPSTREAM_DISTRO=debian/eol:buster
DISTRO=debian-buster
include ../make/Makefile
diff --git a/debian-buster-jenkins-arm/Makefile
b/debian-buster-jenkins-arm/Makefile
index ea61ed8..c63bf12 100644
--- a/debian-buster-jenkins-arm/Makefile
+++ b/debian-buster-jenkins-arm/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO=debian:buster-slim
+UPSTREAM_DISTRO=debian/eol:buster-slim
DISTRO=debian-buster-slim
include ../make/Makefile
diff --git a/debian-buster-jenkins/Makefile b/debian-buster-jenkins/Makefile
index 67066b3..8fd0302 100644
--- a/debian-buster-jenkins/Makefile
+++ b/debian-buster-jenkins/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO=debian:buster
+UPSTREAM_DISTRO=debian/eol:buster
DISTRO=debian-buster
include ../make/Makefile
diff --git a/debian-buster-obs-latest/Dockerfile
b/debian-buster-obs-latest/Dockerfile
index 4a0d3b0..d46d2f5 100644
--- a/debian-buster-obs-latest/Dockerfile
+++ b/debian-buster-obs-latest/Dockerfile
@@ -1,5 +1,5 @@
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:buster
+ARG UPSTREAM_DISTRO=debian/eol:buster
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
diff --git a/debian-buster-obs-latest/Makefile
b/debian-buster-obs-latest/Makefile
index 67066b3..8fd0302 100644
--- a/debian-buster-obs-latest/Makefile
+++ b/debian-buster-obs-latest/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO=debian:buster
+UPSTREAM_DISTRO=debian/eol:buster
DISTRO=debian-buster
include ../make/Makefile
diff --git a/debian10-obs-submit/Dockerfile b/debian10-obs-submit/Dockerfile
index bc3bbf7..31a0ad7 100644
--- a/debian10-obs-submit/Dockerfile
+++ b/debian10-obs-submit/Dockerfile
@@ -1,6 +1,6 @@
# Used by osmo-ci.git scripts/osmocom-packages-docker.sh
ARG REGISTRY=docker.io
-ARG UPSTREAM_DISTRO=debian:buster
+ARG UPSTREAM_DISTRO=debian/eol:buster
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG UID
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 36dd831..31ad497 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -56,13 +56,13 @@
osmo-*-centos8) echo "almalinux:8"; ;;
centos7-*) echo "centos:centos7" ;;
centos8-*) echo "almalinux:8" ;;
- osmo-*-debian10) echo "debian:buster" ;;
- debian9-*) echo "debian:stretch" ;;
- debian10-*) echo "debian:buster" ;;
+ osmo-*-debian10) echo "debian/eol:buster" ;;
+ debian9-*) echo "debian/eol:stretch" ;;
+ debian10-*) echo "debian/eol:buster" ;;
debian11-*) echo "debian:bullseye" ;;
debian12-*) echo "debian:bookworm" ;;
- debian-stretch-*) echo "debian:stretch" ;;
- debian-buster-*) echo "debian:buster" ;;
+ debian-stretch-*) echo "debian/eol:stretch" ;;
+ debian-buster-*) echo "debian/eol:buster" ;;
debian-bullseye-*) echo "debian:bullseye" ;;
debian-bookworm-*) echo "debian:bookworm" ;;
*) echo "debian:$DEBIAN_DEFAULT" ;;
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40660?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ic960320dcc6c5e8d8cc4d0bdf7541da4b692e10e
Gerrit-Change-Number: 40660
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
