rebuild dockerfiles

- bump alpine version from 3.13 to 3.21
- remove python2-dev from alpine (no longer in OS)
- remove rlm_couchbase from alpine (OS has Couchbase v3, which we can't use)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1b01c3720d34746d671eca10533ca02832c530f3..9b392735eca143ece9679c49ad93c3f852c50440 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -9,6 +9,8 @@ FreeRADIUS 3.2.7 Sat 24 Aug 2024 12:00:00 UTC urgency=low
          the "eap" module.
        * Change idle timeout for incoming radsec connections, to
          better match behavior of radsecproxy.
+       * python2 and rlm_couchbase are no longer available in the
+         alpine docker image.
 
        Feature improvements
        * Print MD5 hash of the configuration files in debug mode.

diff --git a/scripts/docker/dists/alpine/Dockerfile b/scripts/docker/dists/alpine/Dockerfile
index 04c0101223b8b1c639288e812c49f75a8a15fddf..a59bc3fc5c23ed3a5b53ea0587f4f13442c56850 100644 (file)
--- a/scripts/docker/dists/alpine/Dockerfile
+++ b/scripts/docker/dists/alpine/Dockerfile
@@ -3,8 +3,8 @@
 #
 # Rebuild this file with `make docker.alpine.regen`
 #
-ARG from=alpine:3.13
-FROM ${from} as build
+ARG from=alpine:3.21
+FROM ${from} AS build
 
 #
 #  Install build tools
@@ -44,9 +44,9 @@ RUN apk add linux-headers
 RUN apk add pcre-dev libidn-dev krb5-dev samba-dev curl-dev json-c-dev
 RUN apk add openldap-dev unbound-dev
 # languages
-RUN apk add ruby-dev perl-dev python2-dev python3-dev
+RUN apk add ruby-dev perl-dev python3-dev
 # databases
-RUN apk add hiredis-dev libmemcached-dev gdbm-dev libcouchbase-dev
+RUN apk add hiredis-dev libmemcached-dev gdbm-dev
 # sql
 RUN apk add postgresql-dev mariadb-dev unixodbc-dev sqlite-dev
 
@@ -80,8 +80,8 @@ RUN apk update \
     && apk add libcurl json-c libldap hiredis sqlite-dev \
 #RUN apk add libidn krb5
 #RUN apk add unbound-libs
-#RUN apk add ruby-libs perl python2-dev python3-dev
-#RUN apk add libmemcached gdbm libcouchbase
+#RUN apk add ruby-libs perl python3-dev
+#RUN apk add libmemcached gdbm
 #RUN apk add postgresql-dev mariadb-dev unixodbc-dev
     \
     && ln -s /opt/etc/raddb /etc/raddb

diff --git a/scripts/docker/dists/centos7/Dockerfile b/scripts/docker/dists/centos7/Dockerfile
index 538a1fa8135e0d483dddeeb2184fb690a7f3c44c..d83871434965e7c944a4924187d08e7c4c23274a 100644 (file)
--- a/scripts/docker/dists/centos7/Dockerfile
+++ b/scripts/docker/dists/centos7/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.centos7.regen`
 #
 ARG from=centos:7
-FROM ${from} as build
+FROM ${from} AS build
 
 #
 #  CentOS 7 is now EOL, so we need to fix up the repo source

diff --git a/scripts/docker/dists/debian10/Dockerfile b/scripts/docker/dists/debian10/Dockerfile
index 5e9e9a5fcc285930e22a40f73a8810f82c78c362..ac2d6509a2439279608b50bd20f39cbc963c1c91 100644 (file)
--- a/scripts/docker/dists/debian10/Dockerfile
+++ b/scripts/docker/dists/debian10/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.debian10.regen`
 #
 ARG from=debian:buster
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/debian11/Dockerfile b/scripts/docker/dists/debian11/Dockerfile
index f709d95fe4a4024db66e3563ce4fd94f4024a6a2..0885670d0ba6836075acbdb17aa102a906bafdfb 100644 (file)
--- a/scripts/docker/dists/debian11/Dockerfile
+++ b/scripts/docker/dists/debian11/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.debian11.regen`
 #
 ARG from=debian:bullseye
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/debian12/Dockerfile b/scripts/docker/dists/debian12/Dockerfile
index 609e8ae49535c9df6aa783d31421c765039216b7..d8332699a6de6f20402b5cb8dc30ddffcc94cbe4 100644 (file)
--- a/scripts/docker/dists/debian12/Dockerfile
+++ b/scripts/docker/dists/debian12/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.debian12.regen`
 #
 ARG from=debian:bookworm
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/debiansid/Dockerfile b/scripts/docker/dists/debiansid/Dockerfile
index 862a421da9f09ea188b5c453a41659d81366402f..0e201a238154ca56d3a2370e80e7349502128b12 100644 (file)
--- a/scripts/docker/dists/debiansid/Dockerfile
+++ b/scripts/docker/dists/debiansid/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.debiansid.regen`
 #
 ARG from=debian:sid
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/rocky8/Dockerfile b/scripts/docker/dists/rocky8/Dockerfile
index 4dcb92e940f34b47972a1079430688dc1413ce2d..9f58cdda81a720316cd82c683ef9b2dc9b007d36 100644 (file)
--- a/scripts/docker/dists/rocky8/Dockerfile
+++ b/scripts/docker/dists/rocky8/Dockerfile
@@ -4,7 +4,8 @@
 # Rebuild this file with `make docker.rocky8.regen`
 #
 ARG from=rockylinux/rockylinux:8
-FROM ${from} as build
+FROM ${from} AS build
+
 
 #
 #  Install yum
@@ -59,8 +60,10 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-LTB-project'\
 RUN rpm --import https://ltb-project.org/lib/RPM-GPG-KEY-LTB-project
 
 #  Enable EPEL repository for freetds and hiredis
+
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 
+
 #  Enable powertools repo
 RUN yum config-manager --enable powertools
 
@@ -107,6 +110,7 @@ FROM ${from}
 
 COPY --from=build /root/rpms /tmp/
 
+
 #
 #  Install yum
 #
@@ -122,8 +126,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-LTB-project'\
 > /etc/yum.repos.d/ltb-project.repo \
     && rpm --import https://ltb-project.org/lib/RPM-GPG-KEY-LTB-project
 
-
 #  EPEL repository for freetds and hiredis
+
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
     && yum install -y dnf-utils \
     && yum config-manager --enable powertools \

diff --git a/scripts/docker/dists/rocky9/Dockerfile b/scripts/docker/dists/rocky9/Dockerfile
index 0f57010bde70f007430fc4750fb35779fc906c34..53fe79cd68911b023b116431497cab93b806d355 100644 (file)
--- a/scripts/docker/dists/rocky9/Dockerfile
+++ b/scripts/docker/dists/rocky9/Dockerfile
@@ -4,7 +4,8 @@
 # Rebuild this file with `make docker.rocky9.regen`
 #
 ARG from=rockylinux/rockylinux:9
-FROM ${from} as build
+FROM ${from} AS build
+
 
 #
 #  Install yum
@@ -49,8 +50,10 @@ RUN [ -z "$release" ] || git checkout ${release} ; \
 #
 
 #  Enable EPEL repository for freetds and hiredis
+
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
 
+
 #  Enable Code Ready Builder repo (CentOS powertools equivalent)
 RUN yum install -y yum-utils
 RUN yum config-manager --enable crb
@@ -95,14 +98,15 @@ FROM ${from}
 
 COPY --from=build /root/rpms /tmp/
 
+
 #
 #  Install yum
 #
 RUN dnf install -y yum
 
 
-
 #  EPEL repository for freetds and hiredis
+
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
     && yum install -y dnf-utils \
     && yum config-manager --enable crb \

diff --git a/scripts/docker/dists/ubuntu18/Dockerfile b/scripts/docker/dists/ubuntu18/Dockerfile
index 4e3263265b818f54d29e1a41dc504c8401cfc4c4..e412a5eaf14ac265d9044d8a135943376928b22e 100644 (file)
--- a/scripts/docker/dists/ubuntu18/Dockerfile
+++ b/scripts/docker/dists/ubuntu18/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.ubuntu18.regen`
 #
 ARG from=ubuntu:18.04
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/ubuntu20/Dockerfile b/scripts/docker/dists/ubuntu20/Dockerfile
index 4a3bbf49a514cb00720a6209708e125314ca733c..a1cea727cd25d832785ed20154d61aac0e4a7ce7 100644 (file)
--- a/scripts/docker/dists/ubuntu20/Dockerfile
+++ b/scripts/docker/dists/ubuntu20/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.ubuntu20.regen`
 #
 ARG from=ubuntu:20.04
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/ubuntu22/Dockerfile b/scripts/docker/dists/ubuntu22/Dockerfile
index 778112aa1b9c0b4ef5bb6cbb6f9a00c6dc4ed5c5..3bf6c5ffb0db4d3a9f458e8168adef4aeed5e47d 100644 (file)
--- a/scripts/docker/dists/ubuntu22/Dockerfile
+++ b/scripts/docker/dists/ubuntu22/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.ubuntu22.regen`
 #
 ARG from=ubuntu:22.04
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/dists/ubuntu24/Dockerfile b/scripts/docker/dists/ubuntu24/Dockerfile
index ad4520ec3e6c16c5bfbcd085a7d3b0d87b901972..c8a1db935e056244db15c1f3455def8572108a7e 100644 (file)
--- a/scripts/docker/dists/ubuntu24/Dockerfile
+++ b/scripts/docker/dists/ubuntu24/Dockerfile
@@ -4,7 +4,7 @@
 # Rebuild this file with `make docker.ubuntu24.regen`
 #
 ARG from=ubuntu:24.04
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/m4/Dockerfile.alpine.m4 b/scripts/docker/m4/Dockerfile.alpine.m4
index 64c6c8ffd7e631c6854a75370f05ea17191bf466..0d5d4009d913c6c5d5897341fa6b0c9d68a6c901 100644 (file)
--- a/scripts/docker/m4/Dockerfile.alpine.m4
+++ b/scripts/docker/m4/Dockerfile.alpine.m4
@@ -1,5 +1,5 @@
 ARG from=DOCKER_IMAGE
-FROM ${from} as build
+FROM ${from} AS build
 
 #
 #  Install build tools
@@ -39,9 +39,9 @@ RUN apk add linux-headers
 RUN apk add pcre-dev libidn-dev krb5-dev samba-dev curl-dev json-c-dev
 RUN apk add openldap-dev unbound-dev
 # languages
-RUN apk add ruby-dev perl-dev python2-dev python3-dev
+RUN apk add ruby-dev perl-dev python3-dev
 # databases
-RUN apk add hiredis-dev libmemcached-dev gdbm-dev libcouchbase-dev
+RUN apk add hiredis-dev libmemcached-dev gdbm-dev
 # sql
 RUN apk add postgresql-dev mariadb-dev unixodbc-dev sqlite-dev
 
@@ -75,8 +75,8 @@ RUN apk update \
     && apk add libcurl json-c libldap hiredis sqlite-dev \
 #RUN apk add libidn krb5
 #RUN apk add unbound-libs
-#RUN apk add ruby-libs perl python2-dev python3-dev
-#RUN apk add libmemcached gdbm libcouchbase
+#RUN apk add ruby-libs perl python3-dev
+#RUN apk add libmemcached gdbm
 #RUN apk add postgresql-dev mariadb-dev unixodbc-dev
     \
     && ln -s /opt/etc/raddb /etc/raddb

diff --git a/scripts/docker/m4/Dockerfile.deb.m4 b/scripts/docker/m4/Dockerfile.deb.m4
index 0b4e5b5a0c23ea89385278d91e7430a9ade7c30c..a2286959203ae955cc7a69d19e54b1b217d2118a 100644 (file)
--- a/scripts/docker/m4/Dockerfile.deb.m4
+++ b/scripts/docker/m4/Dockerfile.deb.m4
@@ -1,5 +1,5 @@
 ARG from=DOCKER_IMAGE
-FROM ${from} as build
+FROM ${from} AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/scripts/docker/m4/Dockerfile.m4 b/scripts/docker/m4/Dockerfile.m4
index f9890a1b00921397699ddc9cea0cd4eb689cbb2d..f49b23c81667cd8073e6d5efd2734f278f2d4684 100644 (file)
--- a/scripts/docker/m4/Dockerfile.m4
+++ b/scripts/docker/m4/Dockerfile.m4
@@ -18,7 +18,7 @@ define([p_SET], [
 ])
 dnl            D_NAME          PKG_TYPE      OS_NAME   OS_VER  OS_CODENAME     DOCKER_IMAGE
 ifelse(
-       D_NAME, [alpine],       [p_SET([alpine], [alpine], [3.13], [alpine],    [alpine:3.13])],
+       D_NAME, [alpine],       [p_SET([alpine], [alpine], [3.21], [alpine],    [alpine:3.21])],
        D_NAME, [debian10],     [p_SET([deb], [debian], [10],   [buster],       [debian:buster])],
        D_NAME, [debian11],     [p_SET([deb], [debian], [11],   [bullseye],     [debian:bullseye])],
        D_NAME, [debian12],     [p_SET([deb], [debian], [12],   [bookworm],     [debian:bookworm])],

diff --git a/scripts/docker/m4/Dockerfile.rpm.m4 b/scripts/docker/m4/Dockerfile.rpm.m4
index b0b6ef9306dcf48c7d5fa366fb83e1946cfc6fe7..c943f723628de3a270ca268e727dbd12d745ab7c 100644 (file)
--- a/scripts/docker/m4/Dockerfile.rpm.m4
+++ b/scripts/docker/m4/Dockerfile.rpm.m4
@@ -1,5 +1,5 @@
 ARG from=DOCKER_IMAGE
-FROM ${from} as build
+FROM ${from} AS build
 
 ifelse(OS_VER, 7, `dnl
 #