|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 1/2] automation: upgrade Alpine build and test artifact containers to 3.18
From: Stefano Stabellini <stefano.stabellini@xxxxxxx>
Alpine 3.12 is EOL. Also update the containerize script.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
---
.../{3.12-arm64v8.dockerfile => 3.18-arm64v8.dockerfile} | 2 +-
automation/build/alpine/{3.12.dockerfile => 3.18.dockerfile} | 2 +-
automation/scripts/containerize | 4 ++--
.../{3.12-arm64v8.dockerfile => 3.18-arm64v8.dockerfile} | 4 ++--
.../alpine/{3.12.dockerfile => 3.18.dockerfile} | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
rename automation/build/alpine/{3.12-arm64v8.dockerfile =>
3.18-arm64v8.dockerfile} (96%)
rename automation/build/alpine/{3.12.dockerfile => 3.18.dockerfile} (97%)
rename automation/tests-artifacts/alpine/{3.12-arm64v8.dockerfile =>
3.18-arm64v8.dockerfile} (97%)
rename automation/tests-artifacts/alpine/{3.12.dockerfile => 3.18.dockerfile}
(97%)
diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile
b/automation/build/alpine/3.18-arm64v8.dockerfile
similarity index 96%
rename from automation/build/alpine/3.12-arm64v8.dockerfile
rename to automation/build/alpine/3.18-arm64v8.dockerfile
index 1be3bf7805..ce198f7d04 100644
--- a/automation/build/alpine/3.12-arm64v8.dockerfile
+++ b/automation/build/alpine/3.18-arm64v8.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.12
+FROM arm64v8/alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/build/alpine/3.12.dockerfile
b/automation/build/alpine/3.18.dockerfile
similarity index 97%
rename from automation/build/alpine/3.12.dockerfile
rename to automation/build/alpine/3.18.dockerfile
index 72ad3a07ad..ca5756955e 100644
--- a/automation/build/alpine/3.12.dockerfile
+++ b/automation/build/alpine/3.18.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 6d46f63665..16d480ab75 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -24,8 +24,8 @@ die() {
#
BASE="registry.gitlab.com/xen-project/xen"
case "_${CONTAINER}" in
- _alpine) CONTAINER="${BASE}/alpine:3.12" ;;
- _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.12-arm64v8" ;;
+ _alpine) CONTAINER="${BASE}/alpine:3.18" ;;
+ _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;;
_archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
_riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;;
_centos7) CONTAINER="${BASE}/centos:7" ;;
diff --git a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
similarity index 97%
rename from automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
rename to automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
index cb8e9e59bb..cbd96d9bc6 100644
--- a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
+++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.12
+FROM arm64v8/alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
@@ -18,7 +18,7 @@ RUN \
apk add sudo && \
apk add dbus && \
apk add bash && \
- apk add python2 && \
+ apk add python3 && \
apk add zlib && \
apk add ncurses && \
apk add texinfo && \
diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile
b/automation/tests-artifacts/alpine/3.18.dockerfile
similarity index 97%
rename from automation/tests-artifacts/alpine/3.12.dockerfile
rename to automation/tests-artifacts/alpine/3.18.dockerfile
index 073f16a0d7..32aa8e1778 100644
--- a/automation/tests-artifacts/alpine/3.12.dockerfile
+++ b/automation/tests-artifacts/alpine/3.18.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
@@ -19,7 +19,7 @@ RUN \
apk add sudo && \
apk add dbus && \
apk add bash && \
- apk add python2 && \
+ apk add python3 && \
apk add zlib && \
apk add ncurses && \
apk add texinfo && \
--
2.25.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |