Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add alpine support #421

Merged
merged 116 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
349c3ef
Add alpine support
adamiBs Sep 15, 2024
8dd9a2b
install dependencies to satisfy modules requirements
maxb-io Sep 19, 2024
8769300
try to build and test without redisearch module
maxb-io Sep 19, 2024
02eeab2
try to build and test without redisearch module
maxb-io Sep 19, 2024
0eeaea9
try to build and test without redisearch module
maxb-io Sep 19, 2024
b10da7f
try to build and test without redisearch module
maxb-io Sep 19, 2024
e5d2eff
try to build and test without redisearch module
maxb-io Sep 19, 2024
8e077b4
Added dependencies for redisjson
maxb-io Sep 19, 2024
5518230
Added dependencies for redisjson
maxb-io Sep 19, 2024
5eaf8a9
Added dependencies for redisjson
maxb-io Sep 19, 2024
59cd92e
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
e26ce8d
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
aed1ab3
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
bfca60e
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
946574a
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
8084c2b
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
04a4575
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
06a34ab
restored redisjson and set alpine to 3.19
maxb-io Sep 22, 2024
3b37f86
attempt to build on alpine 3.latest
maxb-io Sep 22, 2024
734ca63
attempt to build on alpine latest
maxb-io Sep 22, 2024
a31adf8
attempt to build on alpine latest
maxb-io Sep 22, 2024
73667ed
trying to use clang16 instead of clang18
maxb-io Sep 22, 2024
b15f400
switched back to clang18
maxb-io Sep 22, 2024
c41e7a1
removed duplicate package install
maxb-io Sep 22, 2024
0711b9e
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
d284da2
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
55ca85a
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
45c1dc3
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
e96891a
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
43517df
removed duplicate package install and install qemu only if input plat…
maxb-io Sep 23, 2024
8581bf8
remove qemu package on amd64
maxb-io Sep 23, 2024
8cacb3f
remove qemu package on amd64
maxb-io Sep 23, 2024
8bd3d75
remove qemu package on amd64
maxb-io Sep 23, 2024
ab1d87d
remove qemu package on amd64
maxb-io Sep 23, 2024
ef2dddf
remove qemu package on amd64
maxb-io Sep 23, 2024
7c80691
remove qemu package on amd64
maxb-io Sep 23, 2024
943aa9b
remove qemu package on amd64
maxb-io Sep 23, 2024
70a4262
remove qemu package on amd64
maxb-io Sep 23, 2024
7c7e786
remove qemu package on amd64
maxb-io Sep 23, 2024
e94a91c
remove qemu package on amd64
maxb-io Sep 23, 2024
c2219e5
remove qemu package on amd64
maxb-io Sep 23, 2024
831ce73
remove qemu package on amd64
maxb-io Sep 23, 2024
2d4daa5
remove qemu package on amd64
maxb-io Sep 23, 2024
9b96ca6
remove qemu package on amd64
maxb-io Sep 23, 2024
9997b72
remove qemu package on amd64
maxb-io Sep 24, 2024
18edcbd
remove qemu package on amd64
maxb-io Sep 24, 2024
d53129c
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
5d88b1c
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
654917a
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
b5d7c03
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
29fa6c0
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
fe1a16b
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
d86012e
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
d97efef
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
7a75448
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
90fbb7f
changed back to GH runners
maxb-io Sep 24, 2024
66bfa61
remove uninstall qemu package on amd64
maxb-io Sep 24, 2024
f890071
remove uninstall qemu package on amd64
maxb-io Sep 25, 2024
e6659db
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
5a1a7fd
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
aac091e
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
9afd883
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
589fb60
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
4656bdd
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
2dfe329
switching to selfhosted runners [self-hosted, Linux, X86, ubuntu-2204…
maxb-io Sep 25, 2024
0d3b56e
trying to test alpine 3.11 in order to solve dns issues of Alpine in …
maxb-io Sep 25, 2024
a468ca0
trying to test alpine 3.11 in order to solve dns issues of Alpine in …
maxb-io Sep 25, 2024
56d7f3e
due to dns issue with dns on latest alpine switching back to GH hoste…
maxb-io Sep 25, 2024
362c57d
due to dns issue with dns on latest alpine switching back to GH hoste…
maxb-io Sep 25, 2024
ce8e328
due to dns issue with dns on latest alpine switching back to GH hoste…
maxb-io Sep 25, 2024
60dfb74
due to dns issue with dns on latest alpine switching back to GH hoste…
maxb-io Sep 25, 2024
12691ce
limited Verify installed modules step to AMD64 only and added a clean…
maxb-io Sep 26, 2024
8f142b7
try to delete /usr/lib/python* from the image to decrease space
maxb-io Sep 26, 2024
19b84da
print docker images and docker ps -a
maxb-io Sep 26, 2024
93725cc
switched back to ubuntu-latest runners. Removed arm64 from Verify in…
maxb-io Sep 26, 2024
0b4ba92
switched back to ubuntu-latest runners. Removed arm64 from Verify in…
maxb-io Sep 26, 2024
ef49b0f
Removed .idea files
maxb-io Sep 29, 2024
d8e8777
Removed .idea files
maxb-io Sep 29, 2024
5b2510f
trying to get_source before actual build
maxb-io Sep 29, 2024
abc6e96
trying to get_source before actual build
maxb-io Sep 29, 2024
6e6ab6d
trying to get_source before actual build
maxb-io Sep 29, 2024
661cea5
trying to get_source before actual build
maxb-io Sep 29, 2024
ac5919f
trying to get_source before actual build
maxb-io Sep 29, 2024
8b98275
trying to get_source before actual build
maxb-io Sep 29, 2024
1cfc0ce
trying to get_source before actual build
maxb-io Sep 29, 2024
b82664d
trying to get_source before actual build
maxb-io Sep 29, 2024
7fdeefb
trying to get_source before actual build
maxb-io Sep 29, 2024
f7f73d2
trying to get_source before actual build
maxb-io Sep 29, 2024
cd4bdd8
trying to get_source before actual build
maxb-io Sep 29, 2024
59df883
trying to get_source before actual build
maxb-io Sep 29, 2024
7043b12
trying to get_source before actual build
maxb-io Sep 29, 2024
70b9e69
trying to get_source before actual build
maxb-io Sep 29, 2024
f96c5f2
trying to get_source before actual build
maxb-io Sep 29, 2024
747029b
trying to get_source before actual build
maxb-io Sep 29, 2024
9547a09
trying to get_source before actual build
maxb-io Sep 29, 2024
23edec3
trying to get_source before actual build
maxb-io Sep 29, 2024
c8d34c1
trying to get_source before actual build
maxb-io Sep 29, 2024
db115cc
trying to get_source before actual build
maxb-io Sep 29, 2024
bfb1489
trying to get_source before actual build
maxb-io Sep 29, 2024
47c8687
trying to get_source before actual build
maxb-io Sep 29, 2024
394b371
trying to get_source before actual build
maxb-io Sep 29, 2024
4b6ea47
trying to get_source before actual build
maxb-io Sep 29, 2024
9533640
trying to get_source before actual build
maxb-io Sep 29, 2024
9cee5c4
clean up comments and debug info
maxb-io Sep 29, 2024
ea031fc
clean up
maxb-io Sep 30, 2024
5aa8431
redis 8.0 with modules
maxb-io Oct 1, 2024
07840bb
added g++
maxb-io Oct 1, 2024
163b36b
start testing redis v8-m2
maxb-io Oct 27, 2024
fa2ae24
show sha
maxb-io Oct 27, 2024
28d89ca
show sha
maxb-io Oct 27, 2024
4861e4e
use ubuntu-latest-16-cores because alpine on arm fails on timeout on …
maxb-io Oct 28, 2024
6b2159c
back to ubuntu-latest-8-cores
maxb-io Oct 28, 2024
4ff685e
updates Debian Dockerfile to use branch 8.0
maxb-io Oct 28, 2024
57d5ee4
added g++ for Debian
maxb-io Oct 28, 2024
18b1d35
switch to 8.0-m02
maxb-io Oct 28, 2024
2d8af17
switch to 8.0-m02
maxb-io Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .github/actions/build-and-tag-locally/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand All @@ -57,6 +60,9 @@ runs:
linux/ppc64le)
plaform_name="ppc64le"
;;
linux/riscv64)
plaform_name="riscv64"
;;
linux/s390x)
plaform_name="s390x"
;;
Expand Down Expand Up @@ -100,31 +106,31 @@ 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
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)
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"}'
Expand All @@ -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
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/pre-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

62 changes: 44 additions & 18 deletions alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions debian/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.