Skip to content

Commit

Permalink
use valkey in docker
Browse files Browse the repository at this point in the history
  • Loading branch information
mmacata committed Dec 17, 2024
1 parent dd8da54 commit dc63fb2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker/actinia-core-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/actinia-core-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests_with_redis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" &
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit dc63fb2

Please sign in to comment.