diff --git a/build-images.sh b/build-images.sh index 5b12a6d..0b0683b 100644 --- a/build-images.sh +++ b/build-images.sh @@ -4,7 +4,7 @@ set -e images=() repobase="${REPOBASE:-ghcr.io/nethserver}" -reponame="ldapproxy-binary" +reponame="ldapproxy-app" container=$(buildah from docker.io/library/nginx:1.25.3-alpine) buildah run "${container}" /bin/sh <<'EOF' set -e @@ -23,7 +23,7 @@ buildah add "${container}" ui /ui buildah config \ --label='org.nethserver.tcp-ports-demand=8' \ --label='org.nethserver.flags=core_module no_data_backup' \ - --label="org.nethserver.images=${repobase}/ldapproxy-binary:${IMAGETAG:-latest}" \ + --label="org.nethserver.images=${repobase}/ldapproxy-app:${IMAGETAG:-latest}" \ --entrypoint=/ "${container}" buildah commit "${container}" "${repobase}/${reponame}" images+=("${repobase}/${reponame}") diff --git a/imageroot/bin/update-conf b/imageroot/bin/update-conf index d85a882..977e6bd 100755 --- a/imageroot/bin/update-conf +++ b/imageroot/bin/update-conf @@ -46,7 +46,7 @@ if ! diff -q nginx.conf ${tmpconf} ; then --log-driver=none \ --env=NGINX_ENTRYPOINT_QUIET_LOGS=1 \ --volume=./:/srv:z \ - --rm "${LDAPPROXY_BINARY_IMAGE}" \ + --rm "${LDAPPROXY_APP_IMAGE}" \ nginx -t -c "/srv/${tmpconf}" mv -v ${tmpconf} nginx.conf fi diff --git a/imageroot/systemd/user/ldapproxy.service b/imageroot/systemd/user/ldapproxy.service index 87e0d6f..b89ed27 100644 --- a/imageroot/systemd/user/ldapproxy.service +++ b/imageroot/systemd/user/ldapproxy.service @@ -19,7 +19,7 @@ ExecStart=/usr/bin/podman run \ --network=host \ --replace --name=%N \ --volume=./nginx:/srv:z \ - ${LDAPPROXY_BINARY_IMAGE} nginx -g "daemon off;" -c /srv/nginx.conf + ${LDAPPROXY_APP_IMAGE} nginx -g "daemon off;" -c /srv/nginx.conf ExecReload=-/usr/local/bin/runagent update-conf ExecReload=/usr/bin/podman exec %N nginx -s reload ExecStop=/usr/bin/podman stop --ignore --cidfile %t/ldapproxy.ctr-id -t 10