Skip to content

Commit 63222a2

Browse files
authored
Merge pull request #1 from jmb12686/arch64-support
Add arch64 support to docker build
2 parents c5444a2 + a0a610b commit 63222a2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo ::set-output name=version::snapshot
2424
fi
2525
echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
26-
echo ::set-output name=docker_platforms::linux/arm,linux/amd64
26+
echo ::set-output name=docker_platforms::linux/arm,linux/arm64,linux/amd64
2727
echo ::set-output name=docker_username::jmb12686
2828
echo ::set-output name=docker_image::jmb12686/elasticsearch
2929
-

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ WORKDIR /usr/share/elasticsearch
2525
#################################################################################
2626
# Determine target image architecture and download proper version of JDK
2727
#
28-
# Only linux/arm and linux/amd64 Docker architectures are supported at this time
28+
# Only linux/arm, linux/arm64, and linux/amd64 Docker architectures are supported at this time
2929
#################################################################################
3030
RUN set -eo pipefail && \
3131
echo ${TARGETPLATFORM} && \
32-
if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then JDK_ARCH="arm" ; elif [ "${TARGETPLATFORM}" = "linux/amd64" ] ; then JDK_ARCH="x64" ; else echo "TARGETPLATFORM of ${TARGETPLATFORM} is not supported!" && exit -1 ; fi && \
32+
if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then JDK_ARCH="arm" ; elif [ "${TARGETPLATFORM}" = "linux/arm64" ] ; then JDK_ARCH="aarch64" ; elif [ "${TARGETPLATFORM}" = "linux/amd64" ] ; then JDK_ARCH="x64" ; else echo "TARGETPLATFORM of ${TARGETPLATFORM} is not supported!" && exit -1 ; fi && \
3333
cd /opt && curl --retry 8 -s -L -o openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_${JDK_ARCH}_linux_hotspot_11.0.6_10.tar.gz && cd -
3434
RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}-no-jdk-linux-x86_64.tar.gz -# && cd -
3535

0 commit comments

Comments
 (0)