From 349c3ef4a7260b526baf126f614a07dbf5dc9d1e Mon Sep 17 00:00:00 2001 From: adamiBs Date: Sun, 15 Sep 2024 13:11:03 +0300 Subject: [PATCH 001/116] Add alpine support --- .../actions/build-and-tag-locally/action.yml | 24 ++++++++++++------- .github/workflows/pre-merge.yml | 14 ++++++++++- alpine/Dockerfile | 10 ++++---- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 66015a61..6e936774 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -45,6 +45,9 @@ runs: linux/arm/v5) plaform_name="arm-v5" ;; + linux/arm/v6) + plaform_name="arm-v6" + ;; linux/arm/v7) plaform_name="arm-v7" ;; @@ -57,6 +60,9 @@ runs: linux/ppc64le) plaform_name="ppc64le" ;; + linux/riscv64) + plaform_name="riscv64" + ;; linux/s390x) plaform_name="s390x" ;; @@ -100,24 +106,24 @@ runs: - name: Upload image uses: actions/upload-artifact@v4 with: - name: ${{ steps.platform.outputs.display_name }}-docker-image.tar + name: ${{ steps.platform.outputs.display_name }}-${{ inputs.distribution }}-docker-image.tar path: /tmp/image-${{ steps.platform.outputs.display_name }}.tar retention-days: 45 - name: Run container shell: bash - if: ${{ contains(fromJSON('["amd64", "arm64", "i386"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }} run: | docker run -d --name sanity-test-${{ steps.platform.outputs.display_name }} ${{ github.sha }}:${{ steps.platform.outputs.display_name }} - name: Container Logs - if: ${{ contains(fromJSON('["amd64", "arm64", "i386"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker logs sanity-test-${{ steps.platform.outputs.display_name }} - name: Sanity Tests - if: ${{ contains(fromJSON('["amd64", "arm64", "i386"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli ping @@ -144,7 +150,7 @@ runs: fi - name: Test RedisBloom - if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli BF.ADD popular_keys "redis:hash" @@ -154,7 +160,7 @@ runs: echo "RedisBloom test passed successfully" - name: Test RediSearch - if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli FT.CREATE redis_commands ON HASH PREFIX 1 cmd: SCHEMA name TEXT SORTABLE description TEXT @@ -169,7 +175,7 @@ runs: fi - name: Test RedisTimeSeries - if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli TS.CREATE redis:cpu:usage RETENTION 86400 @@ -185,7 +191,7 @@ runs: fi - name: Test ReJSON - if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli JSON.SET redis:config $ '{"maxmemory":"2gb","maxmemory-policy":"allkeys-lru"}' @@ -200,7 +206,7 @@ runs: - name: Push image uses: docker/build-push-action@v6 - if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64","arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} with: context: ${{ inputs.distribution }} push: true diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 53e3d051..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -12,15 +12,27 @@ jobs: matrix: distribution: - debian - #- alpine + - alpine platform: - linux/amd64 - linux/i386 - linux/arm/v5 + - linux/arm/v6 - linux/arm/v7 - linux/mips64le - linux/ppc64le - linux/s390x + - linux/arm64 + - linux/riscv64 + exclude: + - distribution: alpine + platform: linux/mips64le + - distribution: alpine + platform: linux/arm/v5 + - distribution: debian + platform: linux/riscv64 + - distribution: debian + platform: linux/arm/v6 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 02967ddc..d7928f34 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -37,15 +37,15 @@ RUN set -eux; \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ gpgconf --kill all; \ - rm -f "$GNUPGHOME" /usr/local/bin/gosu.asc; \ + rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ apk del --no-network .gosu-fetch; \ chmod +x /usr/local/bin/gosu; \ gosu --version; \ gosu nobody true -ENV REDIS_VERSION=8.0-m01 -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz -ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c +ENV REDIS_VERSION=support-musl +ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ \ @@ -82,11 +82,11 @@ RUN set -eux; \ libtool \ g++ \ libgcc \ + bash \ ;\ fi; \ \ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ - echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ rm redis.tar.gz; \ From 8dd9a2b85bdeb059f53a010753f137ac401a0b8c Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 10:47:50 +0300 Subject: [PATCH 002/116] install dependencies to satisfy modules requirements --- alpine/Dockerfile | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d7928f34..9d502326 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -67,23 +67,32 @@ RUN set -eux; \ esac; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ apk add --no-cache --virtual .module-build-deps \ - git \ + bash \ + autoconf \ + automake \ + bsd-compat-headers \ + build-base \ + clang \ + clang17-libclang \ cmake \ curl \ - python3 \ + g++ \ + git \ + libgcc \ + libtool \ + openssl \ + openssl-dev \ py3-pip \ py3-virtualenv \ + python3 \ python3-dev \ - unzip \ rsync \ - clang \ - automake \ - autoconf \ - libtool \ - g++ \ - libgcc \ - bash \ - ;\ + tar \ + unzip \ + which \ + xsimd \ + xz \ + ;\ fi; \ \ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ From 87693009cb6cc540081348011d6b4886104e777e Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 12:29:46 +0300 Subject: [PATCH 003/116] try to build and test without redisearch module --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9d502326..9a236176 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ From 02eeab2f1541c3fb6ecf6a7d62441944b663b5ed Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 13:09:19 +0300 Subject: [PATCH 004/116] try to build and test without redisearch module --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9a236176..a182bbc6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,7 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ From 0eeaea96610e0a3fff7e61afc2edcf746ca50975 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 13:31:26 +0300 Subject: [PATCH 005/116] try to build and test without redisearch module --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index a182bbc6..5abeb5fc 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ From b10da7f736f50d497518c8803a50289421d4ed2b Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 15:19:15 +0300 Subject: [PATCH 006/116] try to build and test without redisearch module --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5abeb5fc..71589cc6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ ENV REDIS_VERSION=support-musl #ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-unstable.tar.gz +ENV REDIS_DOWNLOAD_URL=https:https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ From e5d2effde8db84a7b899ec56638c23a24289f033 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 15:38:44 +0300 Subject: [PATCH 007/116] try to build and test without redisearch module --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 71589cc6..b8c2687c 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ ENV REDIS_VERSION=support-musl #ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -ENV REDIS_DOWNLOAD_URL=https:https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb RUN set -eux; \ From 8e077b4c42d7281aafc0244d9f1cea1630799fbc Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 18:13:51 +0300 Subject: [PATCH 008/116] Added dependencies for redisjson --- alpine/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b8c2687c..1b6cc193 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -47,7 +47,7 @@ ENV REDIS_VERSION=support-musl #ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb - +ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ @@ -68,21 +68,30 @@ RUN set -eux; \ esac; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ apk add --no-cache --virtual .module-build-deps \ - bash \ autoconf \ automake \ + bash \ bsd-compat-headers \ build-base \ + cargo \ clang \ clang17-libclang \ + clang18-libclang \ cmake \ curl \ g++ \ + gcc \ git \ + libffi-dev \ libgcc \ libtool \ + linux-headers \ + musl-dev \ + openssh \ openssl \ openssl-dev \ + py-virtualenv \ + py3-cryptography \ py3-pip \ py3-virtualenv \ python3 \ @@ -96,7 +105,8 @@ RUN set -eux; \ ;\ fi; \ \ - wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ + pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q -r tests/pytest/requirements.txt && pip install -q -r .install/build_package_requirements.txt. ;\ + wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ rm redis.tar.gz; \ From 5518230ca242a7111de22fe15fbfcb38369e393f Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 18:51:33 +0300 Subject: [PATCH 009/116] Added dependencies for redisjson --- alpine/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 1b6cc193..8a413ee4 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -75,7 +75,6 @@ RUN set -eux; \ build-base \ cargo \ clang \ - clang17-libclang \ clang18-libclang \ cmake \ curl \ From 5eaf8a9c05934b5707cea75ac69b5a9a5c9e6c15 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 19 Sep 2024 19:43:25 +0300 Subject: [PATCH 010/116] Added dependencies for redisjson --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 6e936774..52f8f3cb 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -137,7 +137,7 @@ runs: echo "Installed modules:" echo "$modules" missing_modules=() - for module in "bf" "search" "timeseries" "ReJSON"; do + for module in "bf" "search" "timeseries"; do if ! echo "$modules" | grep -q "$module"; then missing_modules+=("$module") fi From 59cd92ea20a7f57fa60e73436127875820342503 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:16:42 +0300 Subject: [PATCH 011/116] restored redisjson and set alpine to 3.19 --- .github/actions/build-and-tag-locally/action.yml | 2 +- alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 52f8f3cb..6e936774 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -137,7 +137,7 @@ runs: echo "Installed modules:" echo "$modules" missing_modules=() - for module in "bf" "search" "timeseries"; do + for module in "bf" "search" "timeseries" "ReJSON"; do if ! echo "$modules" | grep -q "$module"; then missing_modules+=("$module") fi diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8a413ee4..8560ed53 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.19 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From e26ce8dd8da9319f292b70962ee01662503cc736 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:23:14 +0300 Subject: [PATCH 012/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8560ed53..487444ea 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.19.4 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From aed1ab35c83df0de175a5cd719e662c93e66d952 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:29:59 +0300 Subject: [PATCH 013/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 487444ea..8a413ee4 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19.4 +FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From bfca60e83906748173f273d6d667e2767f0f9575 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:39:51 +0300 Subject: [PATCH 014/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8a413ee4..8560ed53 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.19 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From 946574afc0100525b9badae83e788c65dd3f38c4 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:43:28 +0300 Subject: [PATCH 015/116] restored redisjson and set alpine to 3.19 --- .idea/.gitignore | 3 +++ .idea/docker-library-redis.iml | 8 ++++++++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 7 +++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 38 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/docker-library-redis.iml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/docker-library-redis.iml b/.idea/docker-library-redis.iml new file mode 100644 index 00000000..d0876a78 --- /dev/null +++ b/.idea/docker-library-redis.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..8b36567e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..dafe5839 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8084c2b2b5e100e05d1b14e1f7e5db59e869c6fd Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 08:47:21 +0300 Subject: [PATCH 016/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8560ed53..1eb60f05 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:latest # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From 04a4575e5d4b7a3fdef058bdbcbc227b30131088 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 09:20:40 +0300 Subject: [PATCH 017/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 1eb60f05..6ec227a9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ @@ -104,7 +104,8 @@ RUN set -eux; \ ;\ fi; \ \ - pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q -r tests/pytest/requirements.txt && pip install -q -r .install/build_package_requirements.txt. ;\ +# install required python packages for RedisJSON module + pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer==2.5.10 ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ From 06a34abf537beba67999255bf92314b31b5794f5 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 10:25:25 +0300 Subject: [PATCH 018/116] restored redisjson and set alpine to 3.19 --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 6ec227a9..b8847e9d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.latest # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ @@ -105,7 +105,7 @@ RUN set -eux; \ fi; \ \ # install required python packages for RedisJSON module - pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer==2.5.10 ;\ + pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ From 3b37f86dd530d01bfc4ea6cb1163312adaeba152 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 10:39:30 +0300 Subject: [PATCH 019/116] attempt to build on alpine 3.latest --- .github/workflows/pre-merge.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 4eefba9d..d39edfe2 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -15,15 +15,15 @@ jobs: - alpine platform: - linux/amd64 - - linux/i386 - - linux/arm/v5 - - linux/arm/v6 - - linux/arm/v7 - - linux/mips64le - - linux/ppc64le - - linux/s390x - - linux/arm64 - - linux/riscv64 +# - linux/i386 +# - linux/arm/v5 +# - linux/arm/v6 +# - linux/arm/v7 +# - linux/mips64le +# - linux/ppc64le +# - linux/s390x +# - linux/arm64 +# - linux/riscv64 exclude: - distribution: alpine platform: linux/mips64le From 734ca63f97663fa6dcf470be920b56ab58426673 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 10:42:54 +0300 Subject: [PATCH 020/116] attempt to build on alpine latest --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b8847e9d..f4378a61 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.latest +FROM alpine:latest # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From a31adf8fb8865124b59cc943719aeed442fc0dc2 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 12:25:26 +0300 Subject: [PATCH 021/116] attempt to build on alpine latest --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f4378a61..0a8eddbc 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -128,7 +128,7 @@ RUN set -eux; \ # https://salsa.debian.org/debian/jemalloc/-/blob/c0a88c37a551be7d12e4863435365c9a6a51525f/debian/rules#L8-23 dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64 | i386 | x32) extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-page=12" ;; \ + amd64 | i386 | x32) echo="$extraJemallocConfigureFlags --with-lg-page=12" ;; \ *) extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-page=16" ;; \ esac; \ extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-hugepage=21"; \ @@ -139,6 +139,7 @@ RUN set -eux; \ export BUILD_TLS=yes; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ + ls -l /usr/lib/llvm18/lib/libclang.so*; \ \ # TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ From 73667edec3bb2ca60c27357d09509799f86bcfa5 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 13:06:36 +0300 Subject: [PATCH 022/116] trying to use clang16 instead of clang18 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 0a8eddbc..2e9b7c9d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -75,7 +75,7 @@ RUN set -eux; \ build-base \ cargo \ clang \ - clang18-libclang \ + clang16-libclang \ cmake \ curl \ g++ \ From b15f400a54cfd7ad79d409a6f0c1155d9b0d7b3a Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 15:01:53 +0300 Subject: [PATCH 023/116] switched back to clang18 --- .github/workflows/pre-merge.yml | 18 +++++++++--------- alpine/Dockerfile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index d39edfe2..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -15,15 +15,15 @@ jobs: - alpine platform: - linux/amd64 -# - linux/i386 -# - linux/arm/v5 -# - linux/arm/v6 -# - linux/arm/v7 -# - linux/mips64le -# - linux/ppc64le -# - linux/s390x -# - linux/arm64 -# - linux/riscv64 + - linux/i386 + - linux/arm/v5 + - linux/arm/v6 + - linux/arm/v7 + - linux/mips64le + - linux/ppc64le + - linux/s390x + - linux/arm64 + - linux/riscv64 exclude: - distribution: alpine platform: linux/mips64le diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 2e9b7c9d..0a8eddbc 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -75,7 +75,7 @@ RUN set -eux; \ build-base \ cargo \ clang \ - clang16-libclang \ + clang18-libclang \ cmake \ curl \ g++ \ From c41e7a19ddc3d8875be870d076fe8a0093f92a0f Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 22 Sep 2024 21:38:34 +0300 Subject: [PATCH 024/116] removed duplicate package install --- alpine/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 0a8eddbc..f778161a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -79,16 +79,12 @@ RUN set -eux; \ cmake \ curl \ g++ \ - gcc \ git \ libffi-dev \ libgcc \ libtool \ - linux-headers \ - musl-dev \ openssh \ openssl \ - openssl-dev \ py-virtualenv \ py3-cryptography \ py3-pip \ From 0711b9e98537af1936d479c9ecf8f554d6f9e524 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 13:25:41 +0300 Subject: [PATCH 025/116] removed duplicate package install and install qemu only if input platform is not amd64 --- .github/actions/build-and-tag-locally/action.yml | 4 +++- alpine/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 6e936774..e3e572fd 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -23,11 +23,13 @@ inputs: runs: using: "composite" steps: - - name: Install QEMU + - name: Install QEMU user static (if platform is not linux/arm64) shell: bash + if: github.event.inputs.platform != 'linux/amd64' run: | sudo apt-get update sudo apt-get install -y qemu-user-static + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f778161a..24b585b4 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From d284da269e4ab7e27e3fb69b87a614fac3768760 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 13:40:19 +0300 Subject: [PATCH 026/116] removed duplicate package install and install qemu only if input platform is not amd64 --- alpine/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 24b585b4..b271d6b9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # https://salsa.debian.org/debian/jemalloc/-/blob/c0a88c37a551be7d12e4863435365c9a6a51525f/debian/rules#L8-23 dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64 | i386 | x32) echo="$extraJemallocConfigureFlags --with-lg-page=12" ;; \ + amd64 | i386 | x32) extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-page=12" ;; \ *) extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-page=16" ;; \ esac; \ extraJemallocConfigureFlags="$extraJemallocConfigureFlags --with-lg-hugepage=21"; \ @@ -135,7 +135,6 @@ RUN set -eux; \ export BUILD_TLS=yes; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ - ls -l /usr/lib/llvm18/lib/libclang.so*; \ \ # TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ From 55ca85a05b5fe7a042e2db10b9649a4ebb296015 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 14:32:07 +0300 Subject: [PATCH 027/116] removed duplicate package install and install qemu only if input platform is not amd64 --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index e3e572fd..e5c5131f 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -25,7 +25,7 @@ runs: steps: - name: Install QEMU user static (if platform is not linux/arm64) shell: bash - if: github.event.inputs.platform != 'linux/amd64' + if: ${{ github.event.inputs.platform != 'linux/amd64' }} run: | sudo apt-get update sudo apt-get install -y qemu-user-static From 45c1dc31fad0e0df3869e0fb0f461a6265e489a1 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 14:43:35 +0300 Subject: [PATCH 028/116] removed duplicate package install and install qemu only if input platform is not amd64 --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 4eefba9d..3887f03b 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - uses: ./.github/actions/build-and-tag-locally + - uses: ./.github/actions/build-and-tag-locally@RED-134818/maxb-alpine-support with: distribution: ${{ matrix.distribution }} platform: ${{ matrix.platform }} From e96891ad8dc4e327a987a72a6457b41cb0a1b89b Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 14:47:26 +0300 Subject: [PATCH 029/116] removed duplicate package install and install qemu only if input platform is not amd64 --- .github/actions/build-and-tag-locally/action.yml | 1 + .github/workflows/pre-merge.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index e5c5131f..c5dfcf5a 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -27,6 +27,7 @@ runs: shell: bash if: ${{ github.event.inputs.platform != 'linux/amd64' }} run: | + echo "AAAAAAAAAAAAAAAAA" sudo apt-get update sudo apt-get install -y qemu-user-static diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 3887f03b..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - uses: ./.github/actions/build-and-tag-locally@RED-134818/maxb-alpine-support + - uses: ./.github/actions/build-and-tag-locally with: distribution: ${{ matrix.distribution }} platform: ${{ matrix.platform }} From 43517df92a77502c5c65f0fe22a789cf912a96fa Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 14:48:17 +0300 Subject: [PATCH 030/116] removed duplicate package install and install qemu only if input platform is not amd64 --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index c5dfcf5a..8789f673 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -25,7 +25,7 @@ runs: steps: - name: Install QEMU user static (if platform is not linux/arm64) shell: bash - if: ${{ github.event.inputs.platform != 'linux/amd64' }} + if: ${{ inputs.platform != 'linux/amd64' }} run: | echo "AAAAAAAAAAAAAAAAA" sudo apt-get update From 8581bf8f378073700cfc7fdcde3172469333ad0b Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:30:24 +0300 Subject: [PATCH 031/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 8789f673..ed6add30 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -23,14 +23,22 @@ inputs: runs: using: "composite" steps: - - name: Install QEMU user static (if platform is not linux/arm64) + - name: Install QEMU user static (if platform is not linux/amd64) shell: bash if: ${{ inputs.platform != 'linux/amd64' }} run: | - echo "AAAAAAAAAAAAAAAAA" + echo "installing qemu-user-static" sudo apt-get update sudo apt-get install -y qemu-user-static + - name: Uninstall QEMU user static (if platform is linux/amd64) + shell: bash + if: ${{ inputs.platform == 'linux/amd64' }} + run: | + echo "removing qemu-user-static" + sudo apt list --installed| grep qemu-user-static + sudo apt-get remove -y qemu-user-static + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 8cacb3f647491767528105100d35be036ca30770 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:32:41 +0300 Subject: [PATCH 032/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index ed6add30..662b776d 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -36,6 +36,7 @@ runs: if: ${{ inputs.platform == 'linux/amd64' }} run: | echo "removing qemu-user-static" + sudo apt-get update sudo apt list --installed| grep qemu-user-static sudo apt-get remove -y qemu-user-static From 8bd3d75be158c81618bfa71cadeb0f06271a30f6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:46:01 +0300 Subject: [PATCH 033/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 662b776d..bb25fb8e 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -32,12 +32,13 @@ runs: sudo apt-get install -y qemu-user-static - name: Uninstall QEMU user static (if platform is linux/amd64) - shell: bash + shell: bash -v if: ${{ inputs.platform == 'linux/amd64' }} run: | echo "removing qemu-user-static" - sudo apt-get update + id sudo apt list --installed| grep qemu-user-static + echo "removing qemu-user-static" sudo apt-get remove -y qemu-user-static - name: Set up Docker Buildx From ab1d87dcd060ba7b10816e2b6e94aedf5e01ae5c Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:47:15 +0300 Subject: [PATCH 034/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index bb25fb8e..cc3a47bf 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -32,7 +32,7 @@ runs: sudo apt-get install -y qemu-user-static - name: Uninstall QEMU user static (if platform is linux/amd64) - shell: bash -v + shell: bash if: ${{ inputs.platform == 'linux/amd64' }} run: | echo "removing qemu-user-static" From ef2dddf481ef1781487a986bec3aca74401262ab Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:49:00 +0300 Subject: [PATCH 035/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index cc3a47bf..0f2ef2ef 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -37,7 +37,7 @@ runs: run: | echo "removing qemu-user-static" id - sudo apt list --installed| grep qemu-user-static + sudo apt list --installed| grep qemu echo "removing qemu-user-static" sudo apt-get remove -y qemu-user-static From 7c80691bfd109ef07ed5b11cb45376f5c5366a3f Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 15:52:14 +0300 Subject: [PATCH 036/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 0f2ef2ef..8891c880 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -37,7 +37,7 @@ runs: run: | echo "removing qemu-user-static" id - sudo apt list --installed| grep qemu + sudo apt list --installed echo "removing qemu-user-static" sudo apt-get remove -y qemu-user-static From 943aa9bbae51b6e8985d25faf78d597662a6da8e Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 16:22:22 +0300 Subject: [PATCH 037/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 8891c880..57e58b30 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -31,16 +31,15 @@ runs: sudo apt-get update sudo apt-get install -y qemu-user-static - - name: Uninstall QEMU user static (if platform is linux/amd64) + - name: Uninstall QEMU and LLVM on linux/amd64 shell: bash if: ${{ inputs.platform == 'linux/amd64' }} run: | echo "removing qemu-user-static" - id - sudo apt list --installed - echo "removing qemu-user-static" - sudo apt-get remove -y qemu-user-static - + sudo apt-get remove -y qemu-user-static + sudo apt-get remove --purge -y 'llvm*' && sudo apt-get autoremove -y + sudo apt list --installed |grep qemu || true + sudo apt list --installed |grep llvm || true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 70a42629df8489e05aa02bf78aabd54086d97a77 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 16:51:03 +0300 Subject: [PATCH 038/116] remove qemu package on amd64 --- alpine/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b271d6b9..e0113d12 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -73,7 +73,6 @@ RUN set -eux; \ bash \ bsd-compat-headers \ build-base \ - cargo \ clang \ clang18-libclang \ cmake \ From 7c7e786b71a8fb43e22274a0de0ed8e00f651bc6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 16:57:20 +0300 Subject: [PATCH 039/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 57e58b30..32b16b28 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -37,6 +37,7 @@ runs: run: | echo "removing qemu-user-static" sudo apt-get remove -y qemu-user-static + sudo apt-get remove --purge -y 'libclang*' sudo apt-get remove --purge -y 'llvm*' && sudo apt-get autoremove -y sudo apt list --installed |grep qemu || true sudo apt list --installed |grep llvm || true From e94a91cff6b2dd753a288fd401c23e8b324689c0 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 18:06:40 +0300 Subject: [PATCH 040/116] remove qemu package on amd64 --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e0113d12..b271d6b9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -73,6 +73,7 @@ RUN set -eux; \ bash \ bsd-compat-headers \ build-base \ + cargo \ clang \ clang18-libclang \ cmake \ From c2219e55807daba170575abb6979d70be07c725c Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 18:39:10 +0300 Subject: [PATCH 041/116] remove qemu package on amd64 --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b271d6b9..27b8641e 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -80,6 +80,7 @@ RUN set -eux; \ curl \ g++ \ git \ + libc-devtools \ libffi-dev \ libgcc \ libtool \ From 831ce737f1491b933b6eb205cca1c3b219297685 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 18:42:04 +0300 Subject: [PATCH 042/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 1 + alpine/Dockerfile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 32b16b28..122f328e 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -41,6 +41,7 @@ runs: sudo apt-get remove --purge -y 'llvm*' && sudo apt-get autoremove -y sudo apt list --installed |grep qemu || true sudo apt list --installed |grep llvm || true + sudo apt install libc-devtools -y - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 27b8641e..b271d6b9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -80,7 +80,6 @@ RUN set -eux; \ curl \ g++ \ git \ - libc-devtools \ libffi-dev \ libgcc \ libtool \ From 2d4daa58691d33567eab38c35ffba2acf50b8073 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 20:06:12 +0300 Subject: [PATCH 043/116] remove qemu package on amd64 --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b271d6b9..487c7760 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -158,6 +158,7 @@ RUN set -eux; \ )"; \ apk add --no-network --virtual .redis-rundeps $runDeps; \ apk del --no-network .build-deps; \ + apk del --no-network .module-build-deps; \ \ redis-cli --version; \ redis-server --version; From 9b96ca6391099f0f7494b3a963e2e0976c951b20 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 23 Sep 2024 20:17:30 +0300 Subject: [PATCH 044/116] remove qemu package on amd64 --- alpine/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 487c7760..5b36b4f3 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -158,7 +158,9 @@ RUN set -eux; \ )"; \ apk add --no-network --virtual .redis-rundeps $runDeps; \ apk del --no-network .build-deps; \ - apk del --no-network .module-build-deps; \ + if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ + apk del --no-network .module-build-deps; \ + fi; \ \ redis-cli --version; \ redis-server --version; From 9997b7254937b7452a69713103f905eefdc8bdc0 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 11:20:01 +0300 Subject: [PATCH 045/116] remove qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5b36b4f3..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -157,10 +157,10 @@ RUN set -eux; \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ apk add --no-network --virtual .redis-rundeps $runDeps; \ - apk del --no-network .build-deps; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ apk del --no-network .module-build-deps; \ fi; \ + apk del --no-network .build-deps; \ \ redis-cli --version; \ redis-server --version; From 18edcbd6bf6c0406572e9204c4d9fa7d68b0a8c6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 12:09:26 +0300 Subject: [PATCH 046/116] remove qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 122f328e..e20a1d24 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -23,25 +23,13 @@ inputs: runs: using: "composite" steps: - - name: Install QEMU user static (if platform is not linux/amd64) + - name: Install QEMU user static shell: bash - if: ${{ inputs.platform != 'linux/amd64' }} run: | echo "installing qemu-user-static" sudo apt-get update sudo apt-get install -y qemu-user-static - - name: Uninstall QEMU and LLVM on linux/amd64 - shell: bash - if: ${{ inputs.platform == 'linux/amd64' }} - run: | - echo "removing qemu-user-static" - sudo apt-get remove -y qemu-user-static - sudo apt-get remove --purge -y 'libclang*' - sudo apt-get remove --purge -y 'llvm*' && sudo apt-get autoremove -y - sudo apt list --installed |grep qemu || true - sudo apt list --installed |grep llvm || true - sudo apt install libc-devtools -y - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From d53129ce56d4ff871781cd091a33d87297605bee Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 12:10:39 +0300 Subject: [PATCH 047/116] remove uninstall qemu package on amd64 --- .github/actions/build-and-tag-locally/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index e20a1d24..00708cf9 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -29,7 +29,6 @@ runs: echo "installing qemu-user-static" sudo apt-get update sudo apt-get install -y qemu-user-static - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 5d88b1c58ddb384b5792923add760b08b02a888a Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 13:06:19 +0300 Subject: [PATCH 048/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..61e68990 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -#ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ From 654917ac6aa78eef93f6c58241235f6193295d2e Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 13:09:53 +0300 Subject: [PATCH 049/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 61e68990..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ From b5d7c03a36bef449adab3fec1f3755828bb1973d Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 13:16:43 +0300 Subject: [PATCH 050/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..c956556a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux; \ +RUN set -eux;\ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From 29fa6c0115b318ac708257299fbe5cab6b3d31db Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 18:59:17 +0300 Subject: [PATCH 051/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c956556a..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux;\ +RUN set -eux; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From fe1a16bf5d88f6788734b3e3966c31baf2ac0fd1 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 19:29:45 +0300 Subject: [PATCH 052/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..c956556a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux; \ +RUN set -eux;\ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From d86012ee570ffab796db5b5397ecbab366e57fc1 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 20:08:37 +0300 Subject: [PATCH 053/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c956556a..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux;\ +RUN set -eux; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From d97efefcb1183f60485171d622d282a6f02234dd Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 20:16:41 +0300 Subject: [PATCH 054/116] remove uninstall qemu package on amd64 --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 4eefba9d..228128f0 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest] + runs-on: [self-hosted, ubuntu-latest-8-cores] strategy: matrix: distribution: From 7a754482e48ef63c357220d1c1711654c64d94f1 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 20:24:20 +0300 Subject: [PATCH 055/116] remove uninstall qemu package on amd64 --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 228128f0..e6a6c1cc 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [self-hosted, ubuntu-latest-8-cores] + runs-on: [self-hosted, ubuntu-latest-4-cores] strategy: matrix: distribution: From 90fbb7f96ebf058cc27ebc414a73cdec9e377c82 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 20:26:14 +0300 Subject: [PATCH 056/116] changed back to GH runners --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index e6a6c1cc..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [self-hosted, ubuntu-latest-4-cores] + runs-on: [ubuntu-latest] strategy: matrix: distribution: From 66bfa61ccf811d06c3a5893e6c44946818539bfa Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 24 Sep 2024 20:49:58 +0300 Subject: [PATCH 057/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..c956556a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux; \ +RUN set -eux;\ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From f89007185d1e4225967c1442fc70561fc317ecfe Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 09:41:05 +0300 Subject: [PATCH 058/116] remove uninstall qemu package on amd64 --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c956556a..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux;\ +RUN set -eux; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From e6659db5ac9c25e31dae90c279b09cf26e69c372 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 14:08:56 +0300 Subject: [PATCH 059/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 4eefba9d..86f5f1c5 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest] + runs-on: [self-hosted, Linux, X86, ubuntu-2204-x86] strategy: matrix: distribution: From 5a1a7fd115fd1f18de11dca9fb5e6f3dfd900abf Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 14:19:44 +0300 Subject: [PATCH 060/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 86f5f1c5..9dd431c6 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [self-hosted, Linux, X86, ubuntu-2204-x86] + runs-on: [self-hosted, ubuntu-2204-x64] strategy: matrix: distribution: From aac091e406cd333b736a331ed320b65951cc9dfd Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 14:48:56 +0300 Subject: [PATCH 061/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- alpine/Dockerfile | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..8b8c89b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -13,6 +13,34 @@ RUN set -eux; \ tzdata \ ; + apk add --no-cache --virtual .build-deps \ + coreutils \ + dnsmasq \ + dpkg-dev dpkg \ + gcc \ + linux-headers \ + make \ + musl-dev \ + openssl-dev \ + ; \ + +cat > /etc/resolv.conf << EOF +127.0.0.1 +EOF +# add dnsmasq config to solve Alpine DNS issue +cat >> /etc/dnsmasq.conf << EOF +port=53 +listen-address=127.0.0.1 +strict-order +no-resolv +no-poll +server=IP_address_1 +server=IP_address_2 +EOF + +rc-update add dnsmasq default +rc-service dnsmasq start + # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases ENV GOSU_VERSION=1.17 @@ -49,16 +77,6 @@ ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-1 ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ - \ - apk add --no-cache --virtual .build-deps \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - linux-headers \ - make \ - musl-dev \ - openssl-dev \ - ; \ \ arch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ case "$arch" in \ From 9afd8831e57a9cda27456363d43ac4466c75e371 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:06:41 +0300 Subject: [PATCH 062/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- alpine/Dockerfile | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 8b8c89b6..25437686 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -13,33 +13,8 @@ RUN set -eux; \ tzdata \ ; - apk add --no-cache --virtual .build-deps \ - coreutils \ - dnsmasq \ - dpkg-dev dpkg \ - gcc \ - linux-headers \ - make \ - musl-dev \ - openssl-dev \ - ; \ - -cat > /etc/resolv.conf << EOF -127.0.0.1 -EOF -# add dnsmasq config to solve Alpine DNS issue -cat >> /etc/dnsmasq.conf << EOF -port=53 -listen-address=127.0.0.1 -strict-order -no-resolv -no-poll -server=IP_address_1 -server=IP_address_2 -EOF - -rc-update add dnsmasq default -rc-service dnsmasq start +#Atempt to fix DNS resolution issues in alpine +sudo su "echo 'nameserver 8.8.8.8' > /etc/resolv.conf" \ # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -77,6 +52,16 @@ ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-1 ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + linux-headers \ + make \ + musl-dev \ + openssl-dev \ + ; \ \ arch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ case "$arch" in \ From 589fb6020e2ce170e6dbdd4d16bd29df686109f2 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:11:44 +0300 Subject: [PATCH 063/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 25437686..352f31ae 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ tzdata \ ; -#Atempt to fix DNS resolution issues in alpine -sudo su "echo 'nameserver 8.8.8.8' > /etc/resolv.conf" \ +#Atempt to fix DNS resolution issues in alpine, required for self hosted runners +echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases From 4656bdd341e4e1d92999dccb11d413684db539d9 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:18:12 +0300 Subject: [PATCH 064/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- alpine/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 352f31ae..cfa4bf91 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -2,6 +2,8 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ + #Atempt to fix DNS resolution issues in alpine, required for self hosted runners + echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis @@ -13,9 +15,6 @@ RUN set -eux; \ tzdata \ ; -#Atempt to fix DNS resolution issues in alpine, required for self hosted runners -echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ - # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases ENV GOSU_VERSION=1.17 From 2dfe329bf8bf64de74f9d2d7875f87d76d49eba7 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:29:53 +0300 Subject: [PATCH 065/116] switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204-x86] --- alpine/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index cfa4bf91..d2e145e4 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -2,7 +2,8 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ - #Atempt to fix DNS resolution issues in alpine, required for self hosted runners + #Atempt to fix DNS resolution issues in alpine, required for self hosted runners \ + cat /etc/resolv.conf; \ echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ @@ -15,6 +16,9 @@ RUN set -eux; \ tzdata \ ; +#Atempt to fix DNS resolution issues in alpine, required for self hosted runners +RUN echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ + # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases ENV GOSU_VERSION=1.17 From 0d3b56ea3e4930464ba3f436f672b0517e02391f Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:42:51 +0300 Subject: [PATCH 066/116] trying to test alpine 3.11 in order to solve dns issues of Alpine in a self-hosted runner --- alpine/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d2e145e4..9ae15320 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,10 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.11 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ - #Atempt to fix DNS resolution issues in alpine, required for self hosted runners \ - cat /etc/resolv.conf; \ - echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis @@ -16,9 +13,6 @@ RUN set -eux; \ tzdata \ ; -#Atempt to fix DNS resolution issues in alpine, required for self hosted runners -RUN echo 'nameserver 8.8.8.8' > /etc/resolv.conf ; \ - # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases ENV GOSU_VERSION=1.17 From a468ca0b130aa2be6e223abb116a02956a5688b7 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:51:36 +0300 Subject: [PATCH 067/116] trying to test alpine 3.11 in order to solve dns issues of Alpine in a self-hosted runner --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9ae15320..e02f0930 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.20.3 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From 56d7f3e19eb33b5b296d5a9df1d0a1090af7e89a Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 15:58:34 +0300 Subject: [PATCH 068/116] due to dns issue with dns on latest alpine switching back to GH hosted runners and ubuntu-latest-8-cores --- .github/workflows/pre-merge.yml | 2 +- alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 9dd431c6..47a1ec31 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [self-hosted, ubuntu-2204-x64] + runs-on: [ubuntu-latest-8-cores] strategy: matrix: distribution: diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e02f0930..030b91b6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20.3 +FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN set -eux; \ From 362c57da9c3fa24ecc57ffb1678f54c1bb279e5b Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 18:51:19 +0300 Subject: [PATCH 069/116] due to dns issue with dns on latest alpine switching back to GH hosted runners and ubuntu-latest-8-cores --- .github/actions/build-and-tag-locally/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 00708cf9..1649ce8f 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -89,7 +89,7 @@ runs: password: ${{ inputs.registry_password }} - name: Build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v6.7 with: context: ${{ inputs.distribution }} push: false @@ -206,7 +206,7 @@ runs: fi - name: Push image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v6.7 if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} with: context: ${{ inputs.distribution }} From ce8e328deb11884f890c46fb119c997eb1eb2827 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 18:56:12 +0300 Subject: [PATCH 070/116] due to dns issue with dns on latest alpine switching back to GH hosted runners and ubuntu-latest-8-cores --- .github/actions/build-and-tag-locally/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index 1649ce8f..fca74786 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -89,7 +89,7 @@ runs: password: ${{ inputs.registry_password }} - name: Build - uses: docker/build-push-action@v6.7 + uses: docker/build-push-action@v6.7.0 with: context: ${{ inputs.distribution }} push: false @@ -206,7 +206,7 @@ runs: fi - name: Push image - uses: docker/build-push-action@v6.7 + uses: docker/build-push-action@v6.7.0 if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} with: context: ${{ inputs.distribution }} From 60dfb74eb95e60786c65b70a2fd648b4d1ae1599 Mon Sep 17 00:00:00 2001 From: MaxB Date: Wed, 25 Sep 2024 19:10:11 +0300 Subject: [PATCH 071/116] due to dns issue with dns on latest alpine switching back to GH hosted runners and ubuntu-latest-8-cores --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 030b91b6..c956556a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux; \ +RUN set -eux;\ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis From 12691ce5129d9d7bd0da17a5fdf6775d7b657135 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 26 Sep 2024 09:25:18 +0300 Subject: [PATCH 072/116] limited Verify installed modules step to AMD64 only and added a cleanup actions to the dockerfile in order to decrease image size --- .github/actions/build-and-tag-locally/action.yml | 2 +- alpine/Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index fca74786..c0ac497e 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -131,7 +131,7 @@ runs: docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli info server - name: Verify installed modules - if: ${{ contains(fromJSON('["amd64", "arm64",]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | modules=$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli module list) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c956556a..09451ee0 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -161,6 +161,8 @@ RUN set -eux; \ apk del --no-network .module-build-deps; \ fi; \ apk del --no-network .build-deps; \ + apk --purge del apk-tools ; \ + rm -fr ~/.cache/pip* rm -f /sbin/apk && rm -rf /etc/apk && rm -rf /lib/apk && rm -rf /usr/share/apk && rm -rf /var/lib/apk ; \ \ redis-cli --version; \ redis-server --version; From 8f142b75406d7651234188dde3fca110f69c0f32 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 26 Sep 2024 12:17:31 +0300 Subject: [PATCH 073/116] try to delete /usr/lib/python* from the image to decrease space --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 09451ee0..b963b9e8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -162,7 +162,7 @@ RUN set -eux; \ fi; \ apk del --no-network .build-deps; \ apk --purge del apk-tools ; \ - rm -fr ~/.cache/pip* rm -f /sbin/apk && rm -rf /etc/apk && rm -rf /lib/apk && rm -rf /usr/share/apk && rm -rf /var/lib/apk ; \ + rm -fr ~/.cache/pip* rm -f /sbin/apk && rm -rf /etc/apk && rm -rf /lib/apk && rm -rf /usr/share/apk && rm -rf /var/lib/apk && rm -rf /usr/lib/python*; \ \ redis-cli --version; \ redis-server --version; From 19b84da2d9b8d21223dfddfea97da124cc901510 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 26 Sep 2024 13:11:13 +0300 Subject: [PATCH 074/116] print docker images and docker ps -a --- .github/actions/build-and-tag-locally/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index c0ac497e..b748c64d 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -131,9 +131,11 @@ runs: docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli info server - name: Verify installed modules - if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} shell: bash run: | + docker images + docker ps -a modules=$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli module list) echo "Installed modules:" echo "$modules" From 93725ccfd52208ad4ef438d7183adbfa8f3114ec Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 26 Sep 2024 15:35:14 +0300 Subject: [PATCH 075/116] switched back to ubuntu-latest runners. Removed arm64 from Verify installed modules test. --- .github/actions/build-and-tag-locally/action.yml | 2 +- .github/workflows/pre-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index b748c64d..b69bda7b 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -131,7 +131,7 @@ runs: docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli info server - name: Verify installed modules - if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }} + if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | docker images diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 47a1ec31..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest-8-cores] + runs-on: [ubuntu-latest] strategy: matrix: distribution: From 0b4ba920f2802441b7bb9ee3287e160577ef1426 Mon Sep 17 00:00:00 2001 From: MaxB Date: Thu, 26 Sep 2024 21:03:02 +0300 Subject: [PATCH 076/116] switched back to ubuntu-latest runners. Removed arm64 from Verify installed modules test. --- .github/actions/build-and-tag-locally/action.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-and-tag-locally/action.yml b/.github/actions/build-and-tag-locally/action.yml index b69bda7b..70c2a052 100644 --- a/.github/actions/build-and-tag-locally/action.yml +++ b/.github/actions/build-and-tag-locally/action.yml @@ -23,10 +23,9 @@ inputs: runs: using: "composite" steps: - - name: Install QEMU user static + - name: Install QEMU shell: bash run: | - echo "installing qemu-user-static" sudo apt-get update sudo apt-get install -y qemu-user-static - name: Set up Docker Buildx @@ -89,7 +88,7 @@ runs: password: ${{ inputs.registry_password }} - name: Build - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6 with: context: ${{ inputs.distribution }} push: false @@ -134,8 +133,6 @@ runs: if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} shell: bash run: | - docker images - docker ps -a modules=$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli module list) echo "Installed modules:" echo "$modules" @@ -208,7 +205,7 @@ runs: fi - name: Push image - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6 if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }} with: context: ${{ inputs.distribution }} From ef49b0f58772a56aae1e33c7a054d08d34a31a9c Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 10:57:39 +0300 Subject: [PATCH 077/116] Removed .idea files --- .gitignore | 1 + .idea/.gitignore | 3 --- .idea/docker-library-redis.iml | 8 -------- .idea/inspectionProfiles/profiles_settings.xml | 6 ------ .idea/misc.xml | 7 ------- .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 7 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/docker-library-redis.iml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index e43b0f98..3d725761 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.idea \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/docker-library-redis.iml b/.idea/docker-library-redis.iml deleted file mode 100644 index d0876a78..00000000 --- a/.idea/docker-library-redis.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da..00000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8b36567e..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index dafe5839..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From d8e87772a92575d9f9f22ffb8724ea5e4a304bb8 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 11:34:45 +0300 Subject: [PATCH 078/116] Removed .idea files --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3d725761..00000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -.idea \ No newline at end of file From 5b2510f4ea9610a949da2d4798d4a10c4aeb4c4b Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 12:47:37 +0300 Subject: [PATCH 079/116] trying to get_source before actual build --- .github/workflows/pre-merge.yml | 2 +- alpine/Dockerfile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 4eefba9d..47a1ec31 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest] + runs-on: [ubuntu-latest-8-cores] strategy: matrix: distribution: diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b963b9e8..bd39c912 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -103,6 +103,7 @@ RUN set -eux; \ # install required python packages for RedisJSON module pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ +# !!!!!!!!!! ADD BACK before merge !!!!! echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ rm redis.tar.gz; \ @@ -133,6 +134,10 @@ RUN set -eux; \ grep -F "cd jemalloc && ./configure $extraJemallocConfigureFlags " /usr/src/redis/deps/Makefile; \ \ export BUILD_TLS=yes; \ + make -C /usr/src/redis get_source; \ + echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ + ls -l /usr/src/redis/modules/; \ + echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ \ From abc6e96e3fd2101e273d35fe727c42e3caa32ab8 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 13:09:34 +0300 Subject: [PATCH 080/116] trying to get_source before actual build --- alpine/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index bd39c912..d07b72a0 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -134,6 +134,9 @@ RUN set -eux; \ grep -F "cd jemalloc && ./configure $extraJemallocConfigureFlags " /usr/src/redis/deps/Makefile; \ \ export BUILD_TLS=yes; \ + if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + fi; \ make -C /usr/src/redis get_source; \ echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ ls -l /usr/src/redis/modules/; \ From 6e6ab6d37b6a59ac026b3b1f7f037ead46a9a112 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 13:13:37 +0300 Subject: [PATCH 081/116] trying to get_source before actual build --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d07b72a0..36bbfdca 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -137,6 +137,7 @@ RUN set -eux; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ + cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ ls -l /usr/src/redis/modules/; \ From 661cea58b2a422ff651591cf8458cbed69a4070f Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 13:46:07 +0300 Subject: [PATCH 082/116] trying to get_source before actual build --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 36bbfdca..2db07604 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,7 +135,8 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From ac5919f1a123a4da69b09f4e7a10bce7008d92a3 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 13:54:25 +0300 Subject: [PATCH 083/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 2db07604..a4969716 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -136,7 +136,7 @@ RUN set -eux; \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From 8b98275b4666ac2dba24211f52d0588d2a790f7e Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:07:25 +0300 Subject: [PATCH 084/116] trying to get_source before actual build --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index a4969716..602cee1b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,8 +135,8 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \'redisjson' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From 1cfc0ced56b36610a21e726aa13740e653b99c28 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:12:07 +0300 Subject: [PATCH 085/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 602cee1b..6f2c15cb 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,7 +135,7 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ - echo -e "\nget_source:\n\tfor dir in \'redisjson' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ From b82664d1619bf4083e4bd88b707441ff436c0825 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:17:02 +0300 Subject: [PATCH 086/116] trying to get_source before actual build --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 6f2c15cb..4ab46f75 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,8 +135,8 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ - echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == *redisjson* ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From 7fdeefb925e5f8228fa149033035aceda0e947dc Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:27:07 +0300 Subject: [PATCH 087/116] trying to get_source before actual build --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 4ab46f75..bd18478b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -136,7 +136,8 @@ RUN set -eux; \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ # echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From f7f73d28cc0401396057b54f1bb93ebec8c45e6b Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:41:32 +0300 Subject: [PATCH 088/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index bd18478b..ebc4209d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -137,7 +137,7 @@ RUN set -eux; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ # echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From cd4bdd8a4cf69f4d83a8c006b030644958424ad2 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 14:43:31 +0300 Subject: [PATCH 089/116] trying to get_source before actual build --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ebc4209d..df17c63e 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -137,7 +137,8 @@ RUN set -eux; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ # echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From 59df883f763dad3e3ab2ffba81566a99658f7ec9 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:34:08 +0300 Subject: [PATCH 090/116] trying to get_source before actual build --- alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index df17c63e..d28472c5 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,10 +135,10 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ -# echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ make -C /usr/src/redis get_source; \ From 7043b128c91f03903321c1d3b712362f52254745 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:37:13 +0300 Subject: [PATCH 091/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d28472c5..33d3505b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,7 +135,7 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ - echo -e "\nget_source:\n\tfor dir in \'redisjson\' ; do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ + echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ From 70b9e69ddb0ded03df1c96c6f94b6431e0fd8f0e Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:41:53 +0300 Subject: [PATCH 092/116] trying to get_source before actual build --- alpine/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 33d3505b..64f735e3 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -135,15 +135,15 @@ RUN set -eux; \ \ export BUILD_TLS=yes; \ if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ - echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ +# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ fi; \ cat /usr/src/redis/Makefile; \ - make -C /usr/src/redis get_source; \ + make -C /usr/src/redis/redisjson get_source; \ echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ - ls -l /usr/src/redis/modules/; \ + ls -l /usr/src/redis/modules/redisjson; \ echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From f96c5f20cd9576486c790502302df4dbc15883ee Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:44:52 +0300 Subject: [PATCH 093/116] trying to get_source before actual build --- alpine/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 64f735e3..b69d728f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -134,13 +134,13 @@ RUN set -eux; \ grep -F "cd jemalloc && ./configure $extraJemallocConfigureFlags " /usr/src/redis/deps/Makefile; \ \ export BUILD_TLS=yes; \ - if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ +# if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ - fi; \ - cat /usr/src/redis/Makefile; \ +# fi; \ +# cat /usr/src/redis/Makefile; \ make -C /usr/src/redis/redisjson get_source; \ echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ ls -l /usr/src/redis/modules/redisjson; \ From 747029b94739a6e5e1ec0475fd3436296eccd397 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:49:57 +0300 Subject: [PATCH 094/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b69d728f..56500179 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -141,7 +141,7 @@ RUN set -eux; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # fi; \ # cat /usr/src/redis/Makefile; \ - make -C /usr/src/redis/redisjson get_source; \ + make -C /usr/src/redis/modules/redisjson get_source; \ echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ ls -l /usr/src/redis/modules/redisjson; \ echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ From 9547a09e6058f4c35a18d006090406f2b959ffe1 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 15:55:52 +0300 Subject: [PATCH 095/116] trying to get_source before actual build --- alpine/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 56500179..1ffb8a4c 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -141,10 +141,12 @@ RUN set -eux; \ # echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ # fi; \ # cat /usr/src/redis/Makefile; \ - make -C /usr/src/redis/modules/redisjson get_source; \ - echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ - ls -l /usr/src/redis/modules/redisjson; \ - echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ + if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ + make -C /usr/src/redis/modules/redisjson get_source; \ + echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ + ls -l /usr/src/redis/modules/redisjson; \ + echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ + fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ \ From 23edec313fb7eb9f85ef523f1428a0955cacaab0 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 16:08:12 +0300 Subject: [PATCH 096/116] trying to get_source before actual build --- alpine/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 1ffb8a4c..b7acd159 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -143,9 +143,10 @@ RUN set -eux; \ # cat /usr/src/redis/Makefile; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ make -C /usr/src/redis/modules/redisjson get_source; \ - echo "AAAAAAAAAAAAAAAAAAAAAAA" ; \ - ls -l /usr/src/redis/modules/redisjson; \ - echo "BBBBBBBBBBBBBBBBBBBBBBB" ; \ + sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ + chattr +i /usr/src/redis/modules/redisjson/Makefile; \ + ls -l /usr/src/redis/modules/redisjson/Makefile; \ + echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From c8d34c1d2e7345ff6919de3204e9367aed8a4948 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 16:13:09 +0300 Subject: [PATCH 097/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b7acd159..3a6665a5 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -146,7 +146,7 @@ RUN set -eux; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ chattr +i /usr/src/redis/modules/redisjson/Makefile; \ ls -l /usr/src/redis/modules/redisjson/Makefile; \ - echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From db115ccc7e51ee7a7dcb45b4898876402c3aeab6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 17:46:28 +0300 Subject: [PATCH 098/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 3a6665a5..7fc77224 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -146,7 +146,7 @@ RUN set -eux; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ chattr +i /usr/src/redis/modules/redisjson/Makefile; \ ls -l /usr/src/redis/modules/redisjson/Makefile; \ - echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ; \ + echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From bfb148942838c74ab01e876d705803b9a18cc391 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 18:04:18 +0300 Subject: [PATCH 099/116] trying to get_source before actual build --- alpine/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7fc77224..695ea3ac 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -144,9 +144,8 @@ RUN set -eux; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ - chattr +i /usr/src/redis/modules/redisjson/Makefile; \ - ls -l /usr/src/redis/modules/redisjson/Makefile; \ - echo "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" ; \ + echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ + grep RUST_FLAGS /usr/src/redis/modules/redisjson/Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From 47c8687c1ab1883f380891f13506477a88150aa9 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 18:26:31 +0300 Subject: [PATCH 100/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 695ea3ac..5a952bbc 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -145,7 +145,7 @@ RUN set -eux; \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ - grep RUST_FLAGS /usr/src/redis/modules/redisjson/Makefile; \ + grep "RUST_FLAGS" /usr/src/redis/modules/redisjson/Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From 394b371f4b69eac53d2522dd78189dd43956b54f Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 18:30:09 +0300 Subject: [PATCH 101/116] trying to get_source before actual build --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5a952bbc..a15b0521 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -145,7 +145,7 @@ RUN set -eux; \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ - grep "RUST_FLAGS" /usr/src/redis/modules/redisjson/Makefile; \ + cat /usr/src/redis/modules/redisjson/Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From 4b6ea473cf9d6f0701d5d21e4e70ae04918e0468 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 18:34:38 +0300 Subject: [PATCH 102/116] trying to get_source before actual build --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index a15b0521..be019eaa 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -145,7 +145,8 @@ RUN set -eux; \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ - cat /usr/src/redis/modules/redisjson/Makefile; \ + ls -l /usr/src/redis/modules/redisjson/; \ + find /usr/src/redis -name Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From 95336402c87b67fe1cbebddf8969c392a7131b14 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 18:39:49 +0300 Subject: [PATCH 103/116] trying to get_source before actual build --- alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index be019eaa..0b2b7694 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -143,9 +143,10 @@ RUN set -eux; \ # cat /usr/src/redis/Makefile; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ make -C /usr/src/redis/modules/redisjson get_source; \ - sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/Makefile ; \ + sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/src/Makefile ; \ echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ - ls -l /usr/src/redis/modules/redisjson/; \ + ls -l /usr/src/redis/modules/redisjson/src/Makefile; \ + cat /usr/src/redis/modules/redisjson/src/Makefile; \ find /usr/src/redis -name Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ From 9cee5c41570bd30e5969fef07a8453016636c5f6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 29 Sep 2024 20:26:58 +0300 Subject: [PATCH 104/116] clean up comments and debug info --- alpine/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 0b2b7694..69d2bab2 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux;\ +RUN set -eux; \ # alpine already has a gid 999, so we'll use the next id addgroup -S -g 1000 redis; \ adduser -S -G redis -u 999 redis @@ -144,10 +144,7 @@ RUN set -eux; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/src/Makefile ; \ - echo "AAAAAAAAAAAAAAAAAAAAAAAA"; \ - ls -l /usr/src/redis/modules/redisjson/src/Makefile; \ - cat /usr/src/redis/modules/redisjson/src/Makefile; \ - find /usr/src/redis -name Makefile; \ + grep -E 'RUST_FLAGS' /usr/src/redis/modules/redisjson/src/Makefile; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ From ea031fce80f7cbb08a32d255f17797a582f68f98 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 30 Sep 2024 10:57:50 +0300 Subject: [PATCH 105/116] clean up --- alpine/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 69d2bab2..48e6ba62 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -134,13 +134,6 @@ RUN set -eux; \ grep -F "cd jemalloc && ./configure $extraJemallocConfigureFlags " /usr/src/redis/deps/Makefile; \ \ export BUILD_TLS=yes; \ -# if ! grep -q '^get_source:' /usr/src/redis/Makefile; then \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \$(MAKE) -C \$\$dir \$@; done\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\tif [[ \$\$dir == 'redisjson' ]]; then \$(MAKE) -C \$\$dir \$@; fi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \\\n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \\\n\t\t\t\$(MAKE) -C \$\$dir \$@; \\\n\t\tfi; \\\n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ -# echo -e "\nget_source:\n\tfor dir in \$(SUBDIRS); do \n\t\tif [ \"\$\$dir\" = \"redisjson\" ]; then \n\t\t\t\$(MAKE) -C \$\$dir \$@; \n\t\tfi; \n\tdone\n\n.PHONY: get_source" >> /usr/src/redis/Makefile; \ -# fi; \ -# cat /usr/src/redis/Makefile; \ if [ "$BUILD_WITH_MODULES" = "yes" ]; then \ make -C /usr/src/redis/modules/redisjson get_source; \ sed -i 's/^RUST_FLAGS=$/RUST_FLAGS += -C target-feature=-crt-static/' /usr/src/redis/modules/redisjson/src/Makefile ; \ From 5aa84316f373f7e4cb175f02e9071db6239440a6 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 1 Oct 2024 16:37:47 +0300 Subject: [PATCH 106/116] redis 8.0 with modules --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 48e6ba62..9764887b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -45,7 +45,8 @@ RUN set -eux; \ ENV REDIS_VERSION=support-musl #ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-ioa/redis/archive/refs/heads/8.0ma.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ From 07840bbee8f89bca75f433f2db7214a37e0a4646 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 1 Oct 2024 16:43:18 +0300 Subject: [PATCH 107/116] added g++ --- alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9764887b..be19fc71 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -59,6 +59,7 @@ RUN set -eux; \ make \ musl-dev \ openssl-dev \ + g++ \ ; \ \ arch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ From 163b36b23130de2fc5ccbc665941c1462b4b43fd Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 27 Oct 2024 18:10:52 +0200 Subject: [PATCH 108/116] start testing redis v8-m2 --- alpine/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index be19fc71..e81bb301 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -45,7 +45,8 @@ RUN set -eux; \ ENV REDIS_VERSION=support-musl #ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-ioa/redis/archive/refs/heads/8.0ma.tar.gz +#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-ioa/redis/archive/refs/heads/8.0ma.tar.gz +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/8.0.tar.gz #ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb ENV PIP_BREAK_SYSTEM_PACKAGES=1 From fa2ae24d6bf5c978facfb07299942eafad576770 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 27 Oct 2024 20:12:50 +0200 Subject: [PATCH 109/116] show sha --- alpine/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e81bb301..99aea8c8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,11 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -#ENV REDIS_DOWNLOAD_URL=https://github.com/adamiBs/redis/archive/refs/heads/support-musl.tar.gz -#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-ioa/redis/archive/refs/heads/8.0ma.tar.gz ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/8.0.tar.gz -#ENV REDIS_DOWNLOAD_URL=https://github.com/maxb-io/redis/archive/refs/heads/RED-134818-maxb-supp-musle.tar.gz -ENV REDIS_DOWNLOAD_SHA=4de4007d7a18567c69b0adfd3f4606ffcdedd60ef37d62e101ada7e83d6a36cb +ENV REDIS_DOWNLOAD_SHA=e9e4bf2895b830b0e183c2cf03fd9995899926d8d832850239e84e2c845b2721 ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ \ @@ -106,7 +103,8 @@ RUN set -eux; \ # install required python packages for RedisJSON module pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ -# !!!!!!!!!! ADD BACK before merge !!!!! echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ + sha256sum -c *redis.tar.gz; \ + echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ rm redis.tar.gz; \ From 28d89caefd4abf51b7cc798c456fd95f5e2d71a7 Mon Sep 17 00:00:00 2001 From: MaxB Date: Sun, 27 Oct 2024 20:17:48 +0200 Subject: [PATCH 110/116] show sha --- alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 99aea8c8..3ff56f0e 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -103,7 +103,7 @@ RUN set -eux; \ # install required python packages for RedisJSON module pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ - sha256sum -c *redis.tar.gz; \ + sha256sum *redis.tar.gz; \ echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ From 4861e4e9d784da59965908cfecdca207e895b9df Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 28 Oct 2024 07:20:25 +0200 Subject: [PATCH 111/116] use ubuntu-latest-16-cores because alpine on arm fails on timeout on ubuntu-latest-8-cores after 6 hours --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 47a1ec31..9788faba 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest-8-cores] + runs-on: [ubuntu-latest-16-cores] strategy: matrix: distribution: From 6b2159cfbf8f3888bbe35cf40c9ea5db0187e176 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 28 Oct 2024 07:56:47 +0200 Subject: [PATCH 112/116] back to ubuntu-latest-8-cores --- .github/workflows/pre-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 9788faba..47a1ec31 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest-16-cores] + runs-on: [ubuntu-latest-8-cores] strategy: matrix: distribution: From 4ff685e7acc146683d12c17e87b0742bb2b389db Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 28 Oct 2024 11:12:33 +0200 Subject: [PATCH 113/116] updates Debian Dockerfile to use branch 8.0 --- debian/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 05644b0e..d223866e 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -51,8 +51,10 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=8.0-m01 -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz -ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c +#ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz +#ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/8.0.tar.gz +ENV REDIS_DOWNLOAD_SHA=e9e4bf2895b830b0e183c2cf03fd9995899926d8d832850239e84e2c845b2721 RUN set -eux; \ \ From 57d5ee424b95d6620fd9f7e3d5e90b4fe715b89d Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 28 Oct 2024 11:43:13 +0200 Subject: [PATCH 114/116] added g++ for Debian --- debian/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/Dockerfile b/debian/Dockerfile index d223866e..c9849d36 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -65,6 +65,7 @@ RUN set -eux; \ wget \ dpkg-dev \ gcc \ + g++ \ libc6-dev \ libssl-dev \ make \ From 18b1d35f89667b38a4d2879e7720ec0abfceb684 Mon Sep 17 00:00:00 2001 From: MaxB Date: Mon, 28 Oct 2024 23:11:41 +0200 Subject: [PATCH 115/116] switch to 8.0-m02 --- alpine/Dockerfile | 5 ++--- debian/Dockerfile | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 3ff56f0e..ab1a3374 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -44,8 +44,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=support-musl -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/8.0.tar.gz -ENV REDIS_DOWNLOAD_SHA=e9e4bf2895b830b0e183c2cf03fd9995899926d8d832850239e84e2c845b2721 +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m02.tar.gz +ENV REDIS_DOWNLOAD_SHA=c70d565c5403c5e8392942810e980b23478b82218f6069656ea51bc8978176c1 ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN set -eux; \ \ @@ -103,7 +103,6 @@ RUN set -eux; \ # install required python packages for RedisJSON module pip install -q --upgrade setuptools && pip install -q --upgrade pip && pip install -q addict toml jinja2 ramp-packer ;\ wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \ - sha256sum *redis.tar.gz; \ echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \ mkdir -p /usr/src/redis; \ tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \ diff --git a/debian/Dockerfile b/debian/Dockerfile index c9849d36..2826e1b3 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -51,10 +51,8 @@ RUN set -eux; \ gosu nobody true ENV REDIS_VERSION=8.0-m01 -#ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz -#ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/8.0.tar.gz -ENV REDIS_DOWNLOAD_SHA=e9e4bf2895b830b0e183c2cf03fd9995899926d8d832850239e84e2c845b2721 +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m02.tar.gz +ENV REDIS_DOWNLOAD_SHA=c70d565c5403c5e8392942810e980b23478b82218f6069656ea51bc8978176c1 RUN set -eux; \ \ From 2d8af171d60d83052374cb625c8f58f35dc62354 Mon Sep 17 00:00:00 2001 From: MaxB Date: Tue, 29 Oct 2024 09:17:02 +0200 Subject: [PATCH 116/116] switch to 8.0-m02 --- .github/workflows/pre-merge.yml | 2 +- alpine/Dockerfile | 1 - debian/Dockerfile | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 47a1ec31..4eefba9d 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -7,7 +7,7 @@ on: jobs: build-and-test: - runs-on: [ubuntu-latest-8-cores] + runs-on: [ubuntu-latest] strategy: matrix: distribution: diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ab1a3374..60a3ee54 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -43,7 +43,6 @@ RUN set -eux; \ gosu --version; \ gosu nobody true -ENV REDIS_VERSION=support-musl ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m02.tar.gz ENV REDIS_DOWNLOAD_SHA=c70d565c5403c5e8392942810e980b23478b82218f6069656ea51bc8978176c1 ENV PIP_BREAK_SYSTEM_PACKAGES=1 diff --git a/debian/Dockerfile b/debian/Dockerfile index 2826e1b3..b9dc313c 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -50,7 +50,6 @@ RUN set -eux; \ gosu --version; \ gosu nobody true -ENV REDIS_VERSION=8.0-m01 ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m02.tar.gz ENV REDIS_DOWNLOAD_SHA=c70d565c5403c5e8392942810e980b23478b82218f6069656ea51bc8978176c1