diff --git a/docker/actinia-core-alpine/Dockerfile b/docker/actinia-core-alpine/Dockerfile index 209306be..d8646ff3 100644 --- a/docker/actinia-core-alpine/Dockerfile +++ b/docker/actinia-core-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mundialis/actinia:alpine-dependencies-2024-08-14 as build-base +FROM mundialis/actinia:alpine-dependencies-2024-12-14 as build-base FROM osgeo/grass-gis:releasebranch_8_4-alpine as grass FROM build-base as requirements diff --git a/docker/actinia-core-tests/Dockerfile b/docker/actinia-core-tests/Dockerfile index 2cc8b07a..71260874 100644 --- a/docker/actinia-core-tests/Dockerfile +++ b/docker/actinia-core-tests/Dockerfile @@ -28,7 +28,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension -s extension=r.colors.out_ # DL3013 # Pin versions in pip # DL3018: Pin versions in apk add # hadolint ignore=DL3013,DL3018 -RUN apk add --no-cache redis && \ +RUN apk add --no-cache valkey && \ pip install --no-cache-dir pytest pytest-cov iniconfig # uninstall actinia-core and directories from FROM-image diff --git a/tests_with_redis.sh b/tests_with_redis.sh index 49dd7b84..09299455 100755 --- a/tests_with_redis.sh +++ b/tests_with_redis.sh @@ -22,10 +22,10 @@ run_tests_worker (){ mv ${DEFAULT_CONFIG_PATH}_tmp ${DEFAULT_CONFIG_PATH} } -# start redis server -redis-server & +# start valkey server +valkey-server & sleep 1 -redis-cli ping +valkey-cli ping # start webhook server webhook-server --host "0.0.0.0" --port "5005" & @@ -64,8 +64,8 @@ else TEST_RES=$? fi -# stop redis server -redis-cli shutdown +# stop valkey server +valkey-cli shutdown # stop webhook server curl http://0.0.0.0:5005/shutdown