diff --git a/Makefile b/Makefile index 3bc3f0adc583..74226c685c3b 100644 --- a/Makefile +++ b/Makefile @@ -592,7 +592,7 @@ docker-clean: -$(foreach image_id,$(shell docker images --filter=reference='*/*/*awx_devel*' --filter=reference='*/*awx_devel*' --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);) docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean - docker volume rm -f tools_var_lib_awx tools_awx_db tools_awx_db_15 tools_vault_1 tools_grafana_storage tools_prometheus_storage $(shell docker volume ls --filter name=tools_redis_socket_ -q) + docker volume rm -f tools_var_lib_awx tools_awx_db tools_awx_db_15 tools_vault_1 tools_grafana_storage tools_prometheus_storage $(shell docker volume ls --filter name=tools_valkey_socket_ -q) docker-refresh: docker-clean docker-compose diff --git a/tools/docker-compose/README.md b/tools/docker-compose/README.md index 499de97ca364..edeac42632ad 100644 --- a/tools/docker-compose/README.md +++ b/tools/docker-compose/README.md @@ -116,7 +116,7 @@ make docker-compose ##### Start the containers -Run the awx, postgres and redis containers. This utilizes the image built in the previous step, and will automatically start all required services and dependent containers. Once the containers launch, your session will be attached to the awx container, and you'll be able to watch log messages and events in real time. You will see messages from Django and the front end build process. +Run the awx, postgres and valkey containers. This utilizes the image built in the previous step, and will automatically start all required services and dependent containers. Once the containers launch, your session will be attached to the awx container, and you'll be able to watch log messages and events in real time. You will see messages from Django and the front end build process. ```bash $ make docker-compose diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index dd0b651f00b9..88bee6b59b7b 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -76,12 +76,12 @@ services: # - "../../docker-compose/_sources/certs:/etc/receptor/certs" # TODO: optionally generate certs - "/sys/fs/cgroup:/sys/fs/cgroup" - "~/.kube/config:/var/lib/awx/.kube/config" - - "redis_socket_{{ container_postfix }}:/var/run/redis/:rw" + - "valkey_socket_{{ container_postfix }}:/var/run/redis/:rw" privileged: true depends_on: postgres: condition: service_started - redis_{{ container_postfix }}: + valkey_{{ container_postfix }}: condition: service_started {% if editable_dependencies | length > 0 %} init_awx: @@ -99,16 +99,16 @@ services: - "2222:2222" # receptor foo node - "3000:3001" # used by the UI dev env {% endif %} - redis_{{ container_postfix }}: - image: mirror.gcr.io/library/redis:latest - container_name: tools_redis_{{ container_postfix }} + valkey_{{ container_postfix }}: + image: ghcr.io/valkey-io/valkey:7.2.11 + container_name: tools_valkey_{{ container_postfix }} volumes: - - "../../redis/redis.conf:/usr/local/etc/redis/redis.conf:Z" - - "redis_socket_{{ container_postfix }}:/var/run/redis/:rw" + - "../../valkey/valkey.conf:/etc/valkey/valkey.conf:Z" + - "valkey_socket_{{ container_postfix }}:/var/run/redis/:rw" networks: - awx - entrypoint: ["redis-server"] - command: ["/usr/local/etc/redis/redis.conf"] + entrypoint: ["valkey-server"] + command: ["/etc/valkey/valkey.conf"] {% endfor %} {% if control_plane_node_count|int > 1 %} haproxy: @@ -316,8 +316,8 @@ volumes: name: tools_awx_db_15 {% for i in range(control_plane_node_count|int) -%} {% set container_postfix = loop.index %} - redis_socket_{{ container_postfix }}: - name: tools_redis_socket_{{ container_postfix }} + valkey_socket_{{ container_postfix }}: + name: tools_valkey_socket_{{ container_postfix }} {% endfor -%} {% if enable_vault|bool %} hashicorp_vault_data: diff --git a/tools/redis/redis.conf b/tools/valkey/valkey.conf similarity index 85% rename from tools/redis/redis.conf rename to tools/valkey/valkey.conf index ff0db4cbdf30..2943dda42d52 100644 --- a/tools/redis/redis.conf +++ b/tools/valkey/valkey.conf @@ -2,7 +2,7 @@ unixsocket /var/run/redis/redis.sock unixsocketperm 770 port 0 # Do not actually listen to any tcp port -# but include the bind directive because without it redis will +# but include the bind directive because without it the server will # listen on the public interface. Port 0 causes it to NOT listen on # the public interface. Adding the below line is an extra precaution. # If a developer comes by later and wants to listen on a tcp port and changes diff --git a/tools/redis/redis_socket_ha_1/.dir_placeholder b/tools/valkey/valkey_socket_ha_1/.dir_placeholder similarity index 69% rename from tools/redis/redis_socket_ha_1/.dir_placeholder rename to tools/valkey/valkey_socket_ha_1/.dir_placeholder index 7660bfed95f5..9937a941a2ef 100644 --- a/tools/redis/redis_socket_ha_1/.dir_placeholder +++ b/tools/valkey/valkey_socket_ha_1/.dir_placeholder @@ -1 +1 @@ -This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root. +This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the valkey container will be unable to create a socket file in a directory owned by root. diff --git a/tools/redis/redis_socket_ha_2/.dir_placeholder b/tools/valkey/valkey_socket_ha_2/.dir_placeholder similarity index 69% rename from tools/redis/redis_socket_ha_2/.dir_placeholder rename to tools/valkey/valkey_socket_ha_2/.dir_placeholder index 7660bfed95f5..9937a941a2ef 100644 --- a/tools/redis/redis_socket_ha_2/.dir_placeholder +++ b/tools/valkey/valkey_socket_ha_2/.dir_placeholder @@ -1 +1 @@ -This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root. +This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the valkey container will be unable to create a socket file in a directory owned by root. diff --git a/tools/redis/redis_socket_ha_3/.dir_placeholder b/tools/valkey/valkey_socket_ha_3/.dir_placeholder similarity index 69% rename from tools/redis/redis_socket_ha_3/.dir_placeholder rename to tools/valkey/valkey_socket_ha_3/.dir_placeholder index 7660bfed95f5..9937a941a2ef 100644 --- a/tools/redis/redis_socket_ha_3/.dir_placeholder +++ b/tools/valkey/valkey_socket_ha_3/.dir_placeholder @@ -1 +1 @@ -This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root. +This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the valkey container will be unable to create a socket file in a directory owned by root.