diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed index 1413d54..973f8f9 100644 --- a/rockylinux-9/Containerfile-fixed +++ b/rockylinux-9/Containerfile-fixed @@ -1,9 +1,9 @@ -FROM docker.io/library/rockylinux:${releasever} +FROM docker.io/library/rockylinux:${release} RUN sed -i /etc/yum.repos.d/rocky*.repo \ -e 's/^#baseurl=/baseurl=/' \ -e 's/^mirrorlist=/#mirrorlist=/' \ - && echo "${releasever}" >/etc/dnf/vars/releasever \ + -e 's/\$releasever/${release}/' \ && dnf clean all RUN dnf update -y \ diff --git a/rockylinux-9/Containerfile-vault b/rockylinux-9/Containerfile-vault index 6692f37..1c6c419 100644 --- a/rockylinux-9/Containerfile-vault +++ b/rockylinux-9/Containerfile-vault @@ -1,10 +1,10 @@ -FROM docker.io/library/rockylinux:${releasever} +FROM docker.io/library/rockylinux:${release} RUN sed -i /etc/yum.repos.d/rocky*.repo \ -e 's/^#baseurl=/baseurl=/' \ -e 's/^mirrorlist=/#mirrorlist=/' \ + -e 's/\$releasever/${release}/' \ && echo 'vault/rocky' >/etc/dnf/vars/contentdir \ - && echo "${releasever}" >/etc/dnf/vars/releasever \ && dnf clean all RUN dnf update -y \ diff --git a/rockylinux-9/Makefile b/rockylinux-9/Makefile index 0529d81..31ba477 100644 --- a/rockylinux-9/Makefile +++ b/rockylinux-9/Makefile @@ -9,7 +9,7 @@ clean: rm -f Containerfile-9.* Containerfile-9.%: Containerfile-vault - env releasever=9.$* envsubst $@ + env release=9.$* envsubst '$$release' $@ Containerfile-9.3: Containerfile-fixed - env releasever=9.3 envsubst $@ + env release=9.3 envsubst '$$release' $@