Skip to content

Commit ed42fe5

Browse files
authored
Feature/graviton (#590)
* Add support for UF RHEL-8 ARMv8 * Update base image to use docker buildx * Added a fix for armv8 busybox url * Fix reference to base/redhat-8 image * Remove BUSYBOX_URL=busybox-armv8l, allow it to be passed to make
1 parent b68f49b commit ed42fe5

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ base-centos-8:
7575
base-redhat-8:
7676
docker build ${DOCKER_BUILD_FLAGS} --build-arg SCLOUD_URL=${SCLOUD_URL} --label version=${SPLUNK_VERSION} -t base-redhat-8:${IMAGE_VERSION} ./base/redhat-8
7777

78+
base-redhat-8-armv8:
79+
docker buildx build ${DOCKER_BUILD_FLAGS} --build-arg SCLOUD_URL=${SCLOUD_URL} --build-arg BUSYBOX_URL=${BUSYBOX_URL} --label version=${SPLUNK_VERSION} -t base-redhat-8-armv8:${IMAGE_VERSION} ./base/redhat-8
80+
7881
base-windows-2016:
7982
docker build ${DOCKER_BUILD_FLAGS} -t base-windows-2016:${IMAGE_VERSION} ./base/windows-2016
8083

@@ -251,6 +254,14 @@ uf-redhat-8: base-redhat-8 ansible
251254
--build-arg SPLUNK_BUILD_URL=${UF_LINUX_BUILD_URL} \
252255
-t uf-redhat-8:${IMAGE_VERSION} .
253256

257+
uf-redhat-8-armv8: base-redhat-8-armv8 ansible
258+
docker buildx build ${DOCKER_BUILD_FLAGS} \
259+
-f uf/common-files/Dockerfile \
260+
--build-arg SPLUNK_BASE_IMAGE=base-redhat-8-armv8 \
261+
--build-arg SPLUNK_BUILD_URL=${UF_LINUX_BUILD_URL} \
262+
-t uf-redhat-8-armv8:${IMAGE_VERSION} .
263+
264+
254265
uf-windows-2016: base-windows-2016 ansible
255266
docker build ${DOCKER_BUILD_FLAGS} \
256267
-f uf/windows-2016/Dockerfile \

base/redhat-8/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ LABEL name="splunk" \
2626
description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results."
2727

2828
ARG SCLOUD_URL
29+
ARG BUSYBOX_URL
2930
ENV SCLOUD_URL=${SCLOUD_URL} \
31+
BUSYBOX_URL=${BUSYBOX_URL} \
3032
PYTHON_VERSION=3.7.10 \
3133
PYTHON_GPG_KEY_ID=0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
3234

base/redhat-8/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
8282
rm /usr/bin/scloud.tar.gz
8383

8484
# Install busybox direct from the multiarch since EPEL isn't available yet for redhat8
85-
wget -O /bin/busybox https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch`
85+
BUSYBOX_URL=${BUSYBOX_URL:=https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch`}
86+
wget -O /bin/busybox ${BUSYBOX_URL}
8687
chmod +x /bin/busybox
8788

8889
# Enable busybox symlinks

0 commit comments

Comments
 (0)