diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9549367..8a01c9ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: file_pattern: use/ build_db: - if: ${{ false }} + # if: ${{ false }} strategy: matrix: target: ['localdev', 'staging' ] @@ -45,7 +45,7 @@ jobs: env: ${{ matrix.target }} build_server: - if: ${{ false }} + # if: ${{ false }} strategy: matrix: target: [ 'localdev', 'staging' ] @@ -56,7 +56,7 @@ jobs: GH_DODEKACOMCOM_TOKEN: ${{ secrets.GH_DODEKACOMCOM_TOKEN }} build_kv: - if: ${{ false }} + # if: ${{ false }} strategy: matrix: target: [ 'localdev', 'staging' ] diff --git a/build/container/kv/Dockerfile b/build/container/kv/confspawn_Dockerfile similarity index 51% rename from build/container/kv/Dockerfile rename to build/container/kv/confspawn_Dockerfile index ad9bc662..29a8b91d 100644 --- a/build/container/kv/Dockerfile +++ b/build/container/kv/confspawn_Dockerfile @@ -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" ] \ No newline at end of file +CMD [ "redis-server", "{{ kv.redis_conf_dir }}" ] \ No newline at end of file diff --git a/build/container/kv/confspawn_redis_base.conf b/build/container/kv/confspawn_redis.conf similarity index 100% rename from build/container/kv/confspawn_redis_base.conf rename to build/container/kv/confspawn_redis.conf diff --git a/build/deploy/compose/confspawn_docker-compose.yml b/build/deploy/compose/confspawn_docker-compose.yml index 154489d4..7e288ff7 100644 --- a/build/deploy/compose/confspawn_docker-compose.yml +++ b/build/deploy/compose/confspawn_docker-compose.yml @@ -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" ] diff --git a/config.toml b/config.toml index fbbf035b..7a9e01b8 100644 --- a/config.toml +++ b/config.toml @@ -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"