rebuild dockerfiles

mcnewton · mcnewton · commit a00bc9d09f82 · 2025-01-30T23:52:19.000Z
- 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 ARG from=DOCKER_IMAGE
-FROM ${from} as build
+FROM ${from} AS build
 
 ifelse(OS_VER, 7, `dnl
 #

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.centos7.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=centos:7`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`#`
`10`	`10`	`# CentOS 7 is now EOL, so we need to fix up the repo source`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.debian10.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=debian:buster`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`ARG DEBIAN_FRONTEND=noninteractive`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.debian11.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=debian:bullseye`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`ARG DEBIAN_FRONTEND=noninteractive`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.debian12.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=debian:bookworm`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`ARG DEBIAN_FRONTEND=noninteractive`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.debiansid.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=debian:sid`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`ARG DEBIAN_FRONTEND=noninteractive`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	# Rebuild this file with `make docker.rocky9.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=rockylinux/rockylinux:9`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
	`8`	`+`
`8`	`9`
`9`	`10`	`#`
`10`	`11`	`# Install yum`
`@@ -49,8 +50,10 @@ RUN [ -z "$release" ] \|\| git checkout ${release} ; \`
`49`	`50`	`#`
`50`	`51`
`51`	`52`	`# Enable EPEL repository for freetds and hiredis`
	`53`	`+`
`52`	`54`	`RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm`
`53`	`55`
	`56`	`+`
`54`	`57`	`# Enable Code Ready Builder repo (CentOS powertools equivalent)`
`55`	`58`	`RUN yum install -y yum-utils`
`56`	`59`	`RUN yum config-manager --enable crb`
`@@ -95,14 +98,15 @@ FROM ${from}`
`95`	`98`
`96`	`99`	`COPY --from=build /root/rpms /tmp/`
`97`	`100`
	`101`	`+`
`98`	`102`	`#`
`99`	`103`	`# Install yum`
`100`	`104`	`#`
`101`	`105`	`RUN dnf install -y yum`
`102`	`106`
`103`	`107`
`104`		`-`
`105`	`108`	`# EPEL repository for freetds and hiredis`
	`109`	`+`
`106`	`110`	`RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \`
`107`	`111`	`&& yum install -y dnf-utils \`
`108`	`112`	`&& yum config-manager --enable crb \`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	# Rebuild this file with `make docker.ubuntu18.regen`
`5`	`5`	`#`
`6`	`6`	`ARG from=ubuntu:18.04`
`7`		`-FROM ${from} as build`
	`7`	`+FROM ${from} AS build`
`8`	`8`
`9`	`9`	`ARG DEBIAN_FRONTEND=noninteractive`
`10`	`10`