Skip to content

Commit

Permalink
fix kv conf
Browse files Browse the repository at this point in the history
  • Loading branch information
tiptenbrink committed Nov 13, 2023
1 parent 95381d7 commit 9e11b37
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
file_pattern: use/

build_db:
if: ${{ false }}
# if: ${{ false }}
strategy:
matrix:
target: ['localdev', 'staging' ]
Expand All @@ -45,7 +45,7 @@ jobs:
env: ${{ matrix.target }}

build_server:
if: ${{ false }}
# if: ${{ false }}
strategy:
matrix:
target: [ 'localdev', 'staging' ]
Expand All @@ -56,7 +56,7 @@ jobs:
GH_DODEKACOMCOM_TOKEN: ${{ secrets.GH_DODEKACOMCOM_TOKEN }}

build_kv:
if: ${{ false }}
# if: ${{ false }}
strategy:
matrix:
target: [ 'localdev', 'staging' ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Base redis
FROM redis:7.2-bookworm
ADD redis_base.conf /usr/local/etc/redis/redis.conf
ADD redis_base.conf {{ kv.redis_conf_dir }}
# loadmodule in conf is done on startup
COPY librejson.so /rejson/librejson.so
CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
CMD [ "redis-server", "{{ kv.redis_conf_dir }}" ]
File renamed without changes.
2 changes: 1 addition & 1 deletion build/deploy/compose/confspawn_docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
image: "${KV_IMAGE}:${KV_VERSION}"
ports:
- "${KV_HOST_HOST}:${KV_HOST_PORT}:{{ kv.container_port }}"
command: /bin/sh -c "redis-server --requirepass ${REDIS_PASSWORD}"
command: /bin/sh -c "redis-server {{ kv.redis_conf_dir }} --requirepass ${REDIS_PASSWORD}"
restart: {{ confspawn_env.restart }}
{{ server.service_name }}:
profiles: [ "all" ]
Expand Down
1 change: 1 addition & 0 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ service_name = "kv"
container_name = "dodeka-kv-1"
# metaconfig
image_name = "ghcr.io/dsav-dodeka/redis"
redis_conf_dir = "/usr/local/etc/redis/redis.conf"
host_host = "127.0.0.1"
host_port = "6379"
container_port = "6379"
Expand Down

0 comments on commit 9e11b37

Please sign in to comment.