From d03e8a4d119656bab10a71f23bce7e46450ea6ca Mon Sep 17 00:00:00 2001 From: Vincent Lohse Date: Thu, 14 Nov 2024 15:25:11 +0100 Subject: [PATCH 1/5] Use RonDB tarball to run rondb-docker --- .github/workflows/build_test_push.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_test_push.yaml b/.github/workflows/build_test_push.yaml index 7b17178d..5f0f1e2f 100644 --- a/.github/workflows/build_test_push.yaml +++ b/.github/workflows/build_test_push.yaml @@ -35,13 +35,19 @@ jobs: with: fetch-depth: 0 + - name: Download RonDB + run: | + wget $RONDB_TARBALL_URI -O /tmp/temp_tarball.tar.gz + mkdir -p $RONDB_PATH + tar xfz /tmp/temp_tarball.tar.gz -C $RONDB_PATH --strip-components=1 + - name: Run rondb-docker env: RONDB_DOCKER_DIR: /tmp/rondb-docker run: | - path_now=$(pwd) git clone -b release-0.7 https://github.com/logicalclocks/rondb-docker.git $RONDB_DOCKER_DIR cd $RONDB_DOCKER_DIR && ./build_run_docker.sh -d \ + --rondb-tarball-path $RONDB_PATH \ --size small \ --num-mgm-nodes 1 \ --node-groups 1 \ @@ -49,17 +55,10 @@ jobs: --num-mysql-nodes 1 \ --num-rest-api-nodes 0 \ --num-benchmarking-nodes 0 - cd $path_now - name: Build Rondis image run: docker build -t $IMAGE_NAME . - - name: Download RonDB - run: | - wget $RONDB_TARBALL_URI -O /tmp/temp_tarball.tar.gz - mkdir -p $RONDB_PATH - tar xfz /tmp/temp_tarball.tar.gz -C $RONDB_PATH --strip-components=1 - - name: Create Rondis environment run: | docker run -d \ From aeb0792e57877e523397231181bce6eb5f1eb8ae Mon Sep 17 00:00:00 2001 From: Vincent Lohse Date: Thu, 14 Nov 2024 15:41:01 +0100 Subject: [PATCH 2/5] Download RonDB tarball into rondb-docker --- .github/workflows/build_test_push.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_test_push.yaml b/.github/workflows/build_test_push.yaml index 5f0f1e2f..36fa0895 100644 --- a/.github/workflows/build_test_push.yaml +++ b/.github/workflows/build_test_push.yaml @@ -24,7 +24,8 @@ jobs: runs-on: ubuntu-latest env: RONDB_TARBALL_URI: https://repo.hops.works/master/rondb-22.10.5-linux-glibc2.28-x86_64.tar.gz - RONDB_PATH: /tmp/rondb + RONDB_DOCKER_DIR: /tmp/rondb-docker + RONDB_PATH: /tmp/rondb-docker/rondb IMAGE_NAME: rondis:latest CONTAINER_NAME: rondis RONDIS_PORT: 6379 @@ -35,6 +36,11 @@ jobs: with: fetch-depth: 0 + - name: Clone rondb-docker + env: + RONDB_DOCKER_DIR: /tmp/rondb-docker + run: git clone -b release-0.7 https://github.com/logicalclocks/rondb-docker.git $RONDB_DOCKER_DIR + - name: Download RonDB run: | wget $RONDB_TARBALL_URI -O /tmp/temp_tarball.tar.gz @@ -42,12 +48,10 @@ jobs: tar xfz /tmp/temp_tarball.tar.gz -C $RONDB_PATH --strip-components=1 - name: Run rondb-docker - env: - RONDB_DOCKER_DIR: /tmp/rondb-docker run: | - git clone -b release-0.7 https://github.com/logicalclocks/rondb-docker.git $RONDB_DOCKER_DIR + # The script expects a relative path to the tarball cd $RONDB_DOCKER_DIR && ./build_run_docker.sh -d \ - --rondb-tarball-path $RONDB_PATH \ + --rondb-tarball-path ./rondb \ --size small \ --num-mgm-nodes 1 \ --node-groups 1 \ From 02ccb6b84110f27da989f4353ea7fc79674b6112 Mon Sep 17 00:00:00 2001 From: Vincent Lohse Date: Thu, 14 Nov 2024 15:42:58 +0100 Subject: [PATCH 3/5] Removed redundant env --- .github/workflows/build_test_push.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_test_push.yaml b/.github/workflows/build_test_push.yaml index 36fa0895..584bfe73 100644 --- a/.github/workflows/build_test_push.yaml +++ b/.github/workflows/build_test_push.yaml @@ -37,8 +37,6 @@ jobs: fetch-depth: 0 - name: Clone rondb-docker - env: - RONDB_DOCKER_DIR: /tmp/rondb-docker run: git clone -b release-0.7 https://github.com/logicalclocks/rondb-docker.git $RONDB_DOCKER_DIR - name: Download RonDB From 85631054463f78a79c50c58a331a299e8e958997 Mon Sep 17 00:00:00 2001 From: Vincent Lohse Date: Thu, 14 Nov 2024 15:49:42 +0100 Subject: [PATCH 4/5] Specified rondb version --- .github/workflows/build_test_push.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_test_push.yaml b/.github/workflows/build_test_push.yaml index 584bfe73..82806d84 100644 --- a/.github/workflows/build_test_push.yaml +++ b/.github/workflows/build_test_push.yaml @@ -23,6 +23,7 @@ jobs: needs: [build-pink-macos] runs-on: ubuntu-latest env: + RONDB_VERSION: 22.10.5 RONDB_TARBALL_URI: https://repo.hops.works/master/rondb-22.10.5-linux-glibc2.28-x86_64.tar.gz RONDB_DOCKER_DIR: /tmp/rondb-docker RONDB_PATH: /tmp/rondb-docker/rondb @@ -50,6 +51,7 @@ jobs: # The script expects a relative path to the tarball cd $RONDB_DOCKER_DIR && ./build_run_docker.sh -d \ --rondb-tarball-path ./rondb \ + --rondb-version $RONDB_VERSION \ --size small \ --num-mgm-nodes 1 \ --node-groups 1 \ From 3bb470af5585319a31f67925b76d270dfa132c75 Mon Sep 17 00:00:00 2001 From: Vincent Lohse Date: Thu, 14 Nov 2024 16:05:28 +0100 Subject: [PATCH 5/5] Load RonDB tar.gz tarball into Dockerfile --- .github/workflows/build_test_push.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_test_push.yaml b/.github/workflows/build_test_push.yaml index 82806d84..401f7dfa 100644 --- a/.github/workflows/build_test_push.yaml +++ b/.github/workflows/build_test_push.yaml @@ -26,7 +26,8 @@ jobs: RONDB_VERSION: 22.10.5 RONDB_TARBALL_URI: https://repo.hops.works/master/rondb-22.10.5-linux-glibc2.28-x86_64.tar.gz RONDB_DOCKER_DIR: /tmp/rondb-docker - RONDB_PATH: /tmp/rondb-docker/rondb + RONDB_TARBALL_FILE: rondb.tar.gz + RONDB_PATH: /tmp/rondb IMAGE_NAME: rondis:latest CONTAINER_NAME: rondis RONDIS_PORT: 6379 @@ -42,15 +43,16 @@ jobs: - name: Download RonDB run: | - wget $RONDB_TARBALL_URI -O /tmp/temp_tarball.tar.gz + wget $RONDB_TARBALL_URI -O $RONDB_DOCKER_DIR/$RONDB_TARBALL_FILE mkdir -p $RONDB_PATH - tar xfz /tmp/temp_tarball.tar.gz -C $RONDB_PATH --strip-components=1 + tar xfz $RONDB_DOCKER_DIR/$RONDB_TARBALL_FILE -C $RONDB_PATH --strip-components=1 - name: Run rondb-docker run: | + cd $RONDB_DOCKER_DIR # The script expects a relative path to the tarball - cd $RONDB_DOCKER_DIR && ./build_run_docker.sh -d \ - --rondb-tarball-path ./rondb \ + ./build_run_docker.sh -d \ + --rondb-tarball-path ./$RONDB_TARBALL_FILE \ --rondb-version $RONDB_VERSION \ --size small \ --num-mgm-nodes 1 \