diff --git a/docker/pypi/wmagent-base/Dockerfile b/docker/pypi/wmagent-base/Dockerfile index 885cd2488..fb9aa6970 100644 --- a/docker/pypi/wmagent-base/Dockerfile +++ b/docker/pypi/wmagent-base/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cern.ch/cmsweb/oracle:21_5-stable as oracle +FROM registry.cern.ch/cmsweb/oracle:23_9-go1.25-oci8-deb13-aio-stable as oracle FROM registry.cern.ch/cmsweb/dmwm-base:pypi-20250905-stable # see https://docs.docker.com/build/building/best-practices/#apt-get diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index 814430b1b..3d6f9932d 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:master -FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20250905-stable +FROM registry.cern.ch/cmsweb/wmagent-base:pypi-20251008-stable MAINTAINER Valentin Kuznetsov vkuznet@gmail.com # TAG to be passed at build time through `--build-arg TAG=`. Default: None diff --git a/docker/pypi/wmagent/wmagent-docker-run.sh b/docker/pypi/wmagent/wmagent-docker-run.sh index 6048e88c8..c467d9981 100755 --- a/docker/pypi/wmagent/wmagent-docker-run.sh +++ b/docker/pypi/wmagent/wmagent-docker-run.sh @@ -178,6 +178,3 @@ docker exec -u root -it wmagent cp /etc/s-nail_host.rc /etc/s-nail.rc docker exec -u root -it wmagent sh -c "printf 'set v15-compat\nset smtp-auth=none\nset mta=smtp://127.0.0.1:25' >> /etc/s-nail.rc" # Change mail to use s-nail docker exec -u root -it wmagent update-alternatives --install /usr/bin/mailx mailx /usr/bin/s-nail 50 --slave /usr/bin/mail mail /usr/bin/s-nail - -# Workaround for libaio1 package renamed in Debian trixie -docker exec -u root -it wmagent ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64.0.2 /usr/lib/x86_64-linux-gnu/libaio.so.1