Skip to content

Commit 9162b57

Browse files
committed
simplify build process
1 parent 8c5a7ea commit 9162b57

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

opensearch/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG PRODUCT
88
ARG RELEASE
99
ARG OPENSEARCH_SECURITY_PLUGIN
1010
ARG STACKABLE_USER_UID
11+
ARG TARGETARCH
1112

1213
WORKDIR /stackable
1314

@@ -26,17 +27,12 @@ USER ${STACKABLE_USER_UID}
2627
RUN <<EOF
2728
cd "$(/stackable/patchable --images-repo-root=src checkout opensearch ${PRODUCT})"
2829

30+
ARCH="${TARGETARCH/amd64/x64}"
2931
NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
3032
# Create snapshot of the source code including custom patches
3133
tar -czf /stackable/opensearch-${NEW_VERSION}-src.tar.gz .
32-
if [[ $(uname -m) == "arm64" ]]
33-
then
34-
./scripts/build.sh -v ${PRODUCT} -s false -a arm64
35-
tar -xzf artifacts/dist/opensearch-min-${PRODUCT}-linux-arm64.tar.gz -C /stackable
36-
else
37-
./scripts/build.sh -v ${PRODUCT} -s false -a x64
38-
tar -xzf artifacts/dist/opensearch-min-${PRODUCT}-linux-x64.tar.gz -C /stackable
39-
fi
34+
./scripts/build.sh -v "${PRODUCT}" -s false -a "${ARCH}"
35+
tar -xzf artifacts/dist/opensearch-min-${PRODUCT}-linux-${ARCH}.tar.gz -C /stackable
4036
unzip artifacts/core-plugins/repository-s3-${PRODUCT}.zip -d /stackable/opensearch-${PRODUCT}/plugins/repository-s3/
4137
mv /stackable/opensearch-${PRODUCT}/plugins/repository-s3/config /stackable/opensearch-${PRODUCT}/config/repository-s3
4238
unzip artifacts/core-plugins/telemetry-otel-${PRODUCT}.zip -d /stackable/opensearch-${PRODUCT}/plugins/telemetry-otel/

0 commit comments

Comments
 (0)