Skip to content

Commit

Permalink
build: update release ver to 8
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood committed Sep 26, 2024
1 parent d5642b4 commit 9cdcc3b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ versioned-images := php-8.1-fpm \
opensearch-2 \
mysql-8.0 \
mysql-8.4 \
valkey-7
valkey-8

# default-versioned-images are images that formerly had no versioning, and are made backwards-compatible.
# the below versions are the ones that map to the unversioned namespace
Expand Down Expand Up @@ -323,7 +323,7 @@ build/ruby-3.1 build/ruby-3.2 build/ruby-3.3: build/commons
build/opensearch-2: build/commons
build/mongo-4: build/commons
build/mysql-8.0 build/mysql-8.4: build/commons
build/valkey-7: build/commons
build/valkey-8: build/commons

#######
####### Building Images
Expand Down
22 changes: 11 additions & 11 deletions helpers/TESTING_service_images_dockercompose.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp:/
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://redis-7:6379 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://solr-8:8983 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://solr-9:8983 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://valkey-7:6379 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://valkey-8:6379 -timeout 1m
```

Verification commands
Expand Down Expand Up @@ -71,7 +71,7 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep solr-8
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep solr-9
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep nginx
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep valkey-7
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep valkey-8
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep varnish-6
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep varnish-7

Expand Down Expand Up @@ -351,18 +351,18 @@ docker compose exec -T commons sh -c "curl -kL http://nginx:8080" | grep "hr" |
docker compose exec -T commons sh -c "curl -I nginx:8080" | grep -i "Server" | grep -i "openresty"
docker compose exec -T commons sh -c "curl -I nginx:8080" | grep -i "X-Lagoon"

# valkey-7 should be running Valkey v7
docker compose exec -T valkey-7 sh -c "valkey-server --version" | grep v=7.
# valkey-8 should be running Valkey v8
docker compose exec -T valkey-8 sh -c "valkey-server --version" | grep v=8.

# valkey-7 should be able to see Valkey databases
docker compose exec -T valkey-7 sh -c "valkey-cli CONFIG GET databases"
# valkey-8 should be able to see Valkey databases
docker compose exec -T valkey-8 sh -c "valkey-cli CONFIG GET databases"

# valkey-7 should have initialized database
docker compose exec -T valkey-7 sh -c "valkey-cli dbsize"
# valkey-8 should have initialized database
docker compose exec -T valkey-8 sh -c "valkey-cli dbsize"

# valkey-7 should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis?service=valkey-7" | grep "SERVICE_HOST=valkey-7"
docker compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis?service=valkey-7" | grep "LAGOON_TEST_VAR=all-images"
# valkey-8 should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis?service=valkey-8" | grep "SERVICE_HOST=valkey-8"
docker compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis?service=valkey-8" | grep "LAGOON_TEST_VAR=all-images"

# varnish-6 should have correct vmods in varnish folder
docker compose exec -T varnish-6 sh -c "ls -la /usr/lib/varnish/vmods" | grep libvmod_bodyaccess.so
Expand Down
4 changes: 2 additions & 2 deletions helpers/services-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ services:
- "8983"
user: solr

valkey-7:
image: uselagoon/valkey-7:latest
valkey-8:
image: uselagoon/valkey-8:latest
ports:
- "6379"
<< : *default-user # uses the defined user from top
Expand Down
5 changes: 3 additions & 2 deletions images/valkey/7.Dockerfile → images/valkey/8.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/commons AS commons
FROM valkey/valkey:7.2.6-alpine3.20
FROM valkey/valkey:8.0.0-alpine3.20


ARG LAGOON_VERSION
ENV LAGOON_VERSION=$LAGOON_VERSION
Expand All @@ -9,7 +10,7 @@ LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-image
LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
LABEL org.opencontainers.image.description="Valkey 7 image optimised for running in Lagoon in production and locally"
LABEL org.opencontainers.image.title="uselagoon/valkey-7"
LABEL org.opencontainers.image.title="uselagoon/valkey-8"
LABEL org.opencontainers.image.base.name="docker.io/valkey/valkey:7-alpine3.20"

ENV LAGOON=redis
Expand Down

0 comments on commit 9cdcc3b

Please sign in to comment.