Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MOV-AI/containers-redis2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.10
Choose a base ref
...
head repository: MOV-AI/containers-redis2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.11
Choose a head ref
  • 9 commits
  • 5 files changed
  • 4 contributors

Commits on Sep 28, 2022

  1. Bump anothrNick/github-tag-action from 1.46.0 to 1.49.0 

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.49.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](anothrNick/github-tag-action@1.46.0...1.49.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Sep 28, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a98dbd3 View commit details

  2. feat: add port configuration

    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI committed Sep 28, 2022
    Copy the full SHA
    ea5f22a View commit details

  3. update doc

    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI committed Sep 28, 2022
    Copy the full SHA
    fdb8015 View commit details

  4. Merge dev into dependabot/github_actions/anothrNick/github-tag-action… 

    …-1.49.0
    @github-actions
    github-actions[bot] authored Sep 28, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7e17759 View commit details

  5. Merge pull request #15 from MOV-AI/dependabot/github_actions/anothrNi… 

    …ck/github-tag-action-1.49.0

Bump anothrNick/github-tag-action from 1.46.0 to 1.49.0
    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI authored Sep 28, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2f1d3f9 View commit details

Commits on Sep 29, 2022

  1. Bump anothrNick/github-tag-action from 1.46.0 to 1.50.0 

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.50.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](anothrNick/github-tag-action@1.46.0...1.50.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Sep 29, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    862109f View commit details

  2. Merge branch 'dev' into dependabot/github_actions/anothrNick/github-t… 

    …ag-action-1.50.0
    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI authored Sep 29, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10fc74c View commit details

  3. Merge pull request #17 from MOV-AI/dependabot/github_actions/anothrNi… 

    …ck/github-tag-action-1.50.0

Bump anothrNick/github-tag-action from 1.46.0 to 1.50.0
    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI authored Sep 29, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c79a00 View commit details

  4. Merge pull request #16 from MOV-AI/dev 

    DP-806 : Enable port configuration
    @AlexFernandes-MOVAI
    AlexFernandes-MOVAI authored Sep 29, 2022

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b7c8dc View commit details
Showing with 14 additions and 6 deletions.
  1. +1 −1 .github/workflows/bump-version.yml
  2. +3 −1 Dockerfile
  3. +6 −2 README.md
  4. +3 −1 files/bin/movai-entrypoint.sh
  5. +1 −1 files/etc/redis.conf
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
with:
fetch-depth: '0'
- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.46.0
uses: anothrNick/github-tag-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
4 changes: 3 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Dockerfile is the base image for Mov.ai Redis
FROM redislabs/rejson:2.0.7
FROM redislabs/rejson:2.0.11
# Labels
LABEL description="MOV.AI Redis Image"
LABEL maintainer="maintainer@mov.ai"
@@ -9,6 +9,8 @@ LABEL movai="redis"
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 \
8 changes: 6 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
[![Build&Deploy redis images](https://github.com/MOV-AI/containers-redis2/actions/workflows/docker-ci.yml/badge.svg?branch=main)](https://github.com/MOV-AI/containers-redis2/actions/workflows/docker-ci.yml)

# containers-redis2
Base image for MOV.AI Redis
Base image for MOV.AI Redis

This image uses [RedisJSON](https://github.com/RedisJSON/RedisJSON) v2.07 as a base image
This image uses [RedisJSON](https://github.com/RedisJSON/RedisJSON) v2.11 as a base image

# quickstart

docker run -p 6379:6379 --name redis2 pubregistry.aws.cloud.mov.ai/ce/redis2

# run with specific port

docker run -e REDIS_PORT=6380 -p 6380:6380 --name redis2 pubregistry.aws.cloud.mov.ai/ce/redis2
4 changes: 3 additions & 1 deletion files/bin/movai-entrypoint.sh
View file
Original file line number Diff line number Diff line change
@@ -17,11 +17,13 @@
# File: docker-entrypoint.sh
set -m

sed -i -e "/^port:/s/:.*/ $REDIS_PORT/" /etc/redis.conf

# Run command in background
exec docker-entrypoint.sh ${@} &

HOST=localhost
PORT=6379
PORT=$REDIS_PORT

printf "Waiting redis on %s:.\n" "$HOST:$PORT"
while ! redis-cli -h $HOST -p $PORT ping | grep -q PONG; do
2 changes: 1 addition & 1 deletion files/etc/redis.conf
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ protected-mode no

# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
port 6379
port:REDIS_PORT

# TCP listen() backlog.
#