Merge pull request #28 from MOV-AI/dev

Release log_level setting

.github/workflows/bump-version.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: '0'
     - name: Bump version and push tag

.github/workflows/docker-ci.yml

@@ -45,7 +45,7 @@ jobs:
     if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
     steps:
       - name: Login to Movai Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.PORTUS_APP_USER }}
           password: ${{ secrets.PORTUS_APP_TOKEN }}

Dockerfile

@@ -5,12 +5,6 @@ LABEL description="MOV.AI Redis Image"
 LABEL maintainer="maintainer@mov.ai"
 LABEL movai="redis"
 
-# Configure and install
-COPY files/etc/ /etc/
-COPY files/bin/ /usr/local/bin/
-
-ENV REDIS_PORT 6379
-
 # hadolint ignore=DL3008
 RUN apt-get update &&\
     apt-get -y install --no-install-recommends redis-tools \
@@ -22,4 +16,11 @@ RUN apt-get update &&\
     rm -rf /tmp/* &&\
     mkdir -p /default
 
+    # Configure and install
+COPY files/etc/ /etc/
+COPY files/bin/ /usr/local/bin/
+
+ENV REDIS_PORT=6379 \
+    REDIS_LOG_LEVEL=warning
+
 ENTRYPOINT ["movai-entrypoint.sh","/etc/redis.conf"]

README.md

@@ -12,3 +12,12 @@ This image uses [RedisJSON](https://github.com/RedisJSON/RedisJSON) v2.11 as a b
 # run with specific port
 
     docker run -e REDIS_PORT=6380 -p 6380:6380 --name redis2 pubregistry.aws.cloud.mov.ai/ce/redis2
+
+# run with specific log level
+
+    docker run -e REDIS_LOG_LEVEL=notice -p 6379:6379 --name redis2 pubregistry.aws.cloud.mov.ai/ce/redis2
+
+
+## Build
+
+    docker build -t redis2 .

files/bin/movai-entrypoint.sh

@@ -18,14 +18,18 @@
 set -m
 
 sed -i -e "/^port:/s/:.*/ $REDIS_PORT/" /etc/redis.conf
+sed -i -e "/^loglevel:/s/:.*/ $REDIS_LOG_LEVEL/" /etc/redis.conf
 
 # Run command in background
 exec docker-entrypoint.sh ${@} &
 
 HOST=localhost
-PORT=$REDIS_PORT
+PORT=${REDIS_PORT:-6379}
+LOG_LEVEL=${REDIS_LOG_LEVEL:-notice}
 
 printf "Waiting redis on %s:.\n" "$HOST:$PORT"
+printf "Log level: %s\n" "$LOG_LEVEL"
+
 while ! redis-cli -h $HOST -p $PORT ping | grep -q PONG; do
     sleep 1
     printf "."

files/etc/redis.conf

@@ -163,7 +163,7 @@ pidfile /var/run/redis_6379.pid
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
-loglevel notice
+loglevel:REDIS_LOG_LEVEL
 
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard