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.

Sign up for GitHub

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

Build linux binaries with docker buildx #13

Merged
merged 1 commit into from
Jun 2, 2022
Merged

Build linux binaries with docker buildx #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions src/main/docker/build-server-binaries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,25 @@ if ! [ -f "${REDIS_TARBALL}" ]; then
fi

all_linux=0
if command -pv docker 2>/dev/null; then
for arch in x86_64 arm64 i386; do
if command -pv docker buildx 2>/dev/null; then
for arch in amd64 arm64 386; do
builder_name="embedded-redis-builder-$RANDOM"

docker buildx create \
--name "$builder_name" \
--platform linux/amd64,linux/arm64,linux/386

docker buildx use "$builder_name"

echo "*** Building redis version ${REDIS_VERSION} for linux-${arch}"

set +e
docker build \
docker buildx build \
"--platform=linux/${arch}" \
--build-arg "REDIS_VERSION=${REDIS_VERSION}" \
--build-arg "ARCH=${arch}" \
-t "redis-server-builder-${arch}" \
--load \
.

if [[ $? -ne 0 ]]; then
Expand All @@ -53,17 +61,20 @@ if command -pv docker 2>/dev/null; then
fi
set -e

docker buildx rm "$builder_name"

docker run -it --rm \
"--platform=linux/${arch}" \
-v "$(pwd)/":/mnt \
--user "$(id -u):$(id -g)" \
"redis-server-builder-${arch}" \
sh -c "cp /build/redis-server-${REDIS_VERSION}-linux-${arch} /mnt"

((all_linux+=1))

done
else
echo "*** WARNING: No docker command found. Cannot build for linux."
echo "*** WARNING: No docker command found or docker does not support buildx. Cannot build for linux."
fi

if [[ "${all_linux}" -lt 3 ]]; then
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/redis/embedded/RedisExecProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ private RedisExecProvider() {
}

private void initExecutables() {
executables.put(OsArchitecture.UNIX_x86, "redis-server-" + redisVersion + "-linux-i386");
executables.put(OsArchitecture.UNIX_x86_64, "redis-server-" + redisVersion + "-linux-x86_64");
executables.put(OsArchitecture.UNIX_x86, "redis-server-" + redisVersion + "-linux-386");
executables.put(OsArchitecture.UNIX_x86_64, "redis-server-" + redisVersion + "-linux-amd64");
executables.put(OsArchitecture.UNIX_arm64, "redis-server-" + redisVersion + "-linux-arm64");

executables.put(OsArchitecture.MAC_OS_X_x86_64, "redis-server-" + redisVersion + "-darwin-x86_64");
Expand Down
0 ...n/resources/redis-server-6.2.6-linux-i386 → ...in/resources/redis-server-6.2.6-linux-386
View file
Open in desktop
File renamed without changes.
0 ...resources/redis-server-6.2.6-linux-x86_64 → .../resources/redis-server-6.2.6-linux-amd64
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/test/java/redis/embedded/RedisServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public void shouldIndicateInactiveAfterStop() throws Exception {
@Test
public void shouldOverrideDefaultExecutable() throws Exception {
RedisExecProvider customProvider = RedisExecProvider.defaultProvider()
.override(OS.UNIX, Architecture.x86, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-linux-i386").getFile())
.override(OS.UNIX, Architecture.x86_64, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-linux-x86_64").getFile())
.override(OS.UNIX, Architecture.x86, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-linux-386").getFile())
.override(OS.UNIX, Architecture.x86_64, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-linux-amd64").getFile())
.override(OS.UNIX, Architecture.arm64, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-linux-arm64").getFile())
.override(OS.MAC_OS_X, Architecture.x86_64, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-darwin-x86_64").getFile())
.override(OS.MAC_OS_X, Architecture.arm64, Resources.getResource("redis-server-" + RedisExecProvider.redisVersion + "-darwin-arm64").getFile());
Expand Down