From 7868e684bbeaedbbdc15f963b49b099657c85bf8 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 09:39:30 -0600 Subject: [PATCH 01/10] Update docker file to break up installments Signed-off-by: Ian Hoang --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0a777952..d874462e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,9 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get -y update && \ - apt-get install -y curl git gcc pbzip2 pigz make jq && \ - apt-get -y upgrade +RUN apt-get -y update +RUN apt-get install -y curl git gcc pbzip2 pigz make jq +RUN apt-get -y upgrade COPY . opensearch-benchmark From 9fdc3e70ea4c467c97088c2ffaa67f936fb00ac2 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 09:50:04 -0600 Subject: [PATCH 02/10] Break up the installemnts further Signed-off-by: Ian Hoang --- docker/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d874462e..0f850dec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,8 +7,14 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get -y update -RUN apt-get install -y curl git gcc pbzip2 pigz make jq +RUN apt-get update && apt-get upgrade -y +RUN apt-get install -y curl +RUN apt-get install -y git +RUN apt-get install -y gcc +RUN apt-get install -y pbzip2 +RUN apt-get install -y pigz +RUN apt-get install -y make +RUN apt-get install -y jq RUN apt-get -y upgrade COPY . opensearch-benchmark From 160adc49183288373d24808ba253b6fbb69a0bab Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 10:46:59 -0600 Subject: [PATCH 03/10] Add Qemu update Signed-off-by: Ian Hoang --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f850dec..bf4b595f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,9 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update && apt-get upgrade -y +RUN apt-get update && sudo apt-get install qemu qemu-user qemu-user-static +RUN apt-get clean && \ +rm -rf /var/lib/apt/lists/* RUN apt-get install -y curl RUN apt-get install -y git RUN apt-get install -y gcc From fc286708bea249f628d9754852fbb5f9044faf14 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 10:52:00 -0600 Subject: [PATCH 04/10] Remove sudo Signed-off-by: Ian Hoang --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index bf4b595f..b8ca62ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update && sudo apt-get install qemu qemu-user qemu-user-static +RUN apt-get update && apt-get install qemu qemu-user qemu-user-static RUN apt-get clean && \ rm -rf /var/lib/apt/lists/* RUN apt-get install -y curl From 596e770f1cbf70eb67cd04292fc6e81e9fc5ab63 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 10:54:21 -0600 Subject: [PATCH 05/10] Add -y Signed-off-by: Ian Hoang --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b8ca62ea..0de32352 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update && apt-get install qemu qemu-user qemu-user-static +RUN apt-get update -y && apt-get install -y qemu qemu-user qemu-user-static RUN apt-get clean && \ rm -rf /var/lib/apt/lists/* RUN apt-get install -y curl From 7997a56f0096ca5010b367b9ae598e798a1b50dd Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 10:57:06 -0600 Subject: [PATCH 06/10] Add -y Signed-off-by: Ian Hoang --- docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0de32352..bfb81e60 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,7 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update -y && apt-get install -y qemu qemu-user qemu-user-static -RUN apt-get clean && \ -rm -rf /var/lib/apt/lists/* +RUN apt-get update -y && apt-get install -y qemu RUN apt-get install -y curl RUN apt-get install -y git RUN apt-get install -y gcc From 6ee9983dd6e7f3f83097714b3bbc34e0235fb2ea Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 11:03:17 -0600 Subject: [PATCH 07/10] Revise docker-build.yml Signed-off-by: Ian Hoang --- .github/workflows/docker-build.yml | 9 +++++++-- docker/Dockerfile | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index da87a35d..ea879a7b 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -20,8 +20,13 @@ jobs: matrix: platform: ['linux/amd64', 'linux/arm64'] steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 + - name: Run QEMU manual setup + run: | + docker pull tonistiigi/binfmt:latest + docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* + docker run --privileged --rm tonistiigi/binfmt --install all - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/docker/Dockerfile b/docker/Dockerfile index bfb81e60..013bdd04 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update -y && apt-get install -y qemu +RUN apt-get update -y RUN apt-get install -y curl RUN apt-get install -y git RUN apt-get install -y gcc From 6dbb7088d80d009094ce1b2d9761b30b3a9407c2 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 11:07:52 -0600 Subject: [PATCH 08/10] Try another attempt at manual build Signed-off-by: Ian Hoang --- .github/workflows/docker-build.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index ea879a7b..a0ee6887 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -24,9 +24,19 @@ jobs: # uses: docker/setup-qemu-action@v3 - name: Run QEMU manual setup run: | - docker pull tonistiigi/binfmt:latest - docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* + sudo apt update && apt upgrade -y + sudo apt install make -y + sudo apt install ninja-build -y + sudo apt-get install libpixman-1-dev + + wget https://download.qemu.org/qemu-7.0.0.tar.xz + tar xvJf qemu-7.0.0.tar.xz + cd qemu-7.0.0 + ./configure + make + docker run --privileged --rm tonistiigi/binfmt --install all + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From bb22dea5d93e38a1959cb5230ae4ea2f62cf690f Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 11:12:41 -0600 Subject: [PATCH 09/10] Revision Signed-off-by: Ian Hoang --- .github/workflows/docker-build.yml | 32 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a0ee6887..69d1c2e9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -20,22 +20,26 @@ jobs: matrix: platform: ['linux/amd64', 'linux/arm64'] steps: - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - - name: Run QEMU manual setup - run: | - sudo apt update && apt upgrade -y - sudo apt install make -y - sudo apt install ninja-build -y - sudo apt-get install libpixman-1-dev + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + # - name: Run QEMU manual setup + # run: | + # sudo apt update && apt upgrade -y + # sudo apt install make -y + # sudo apt install ninja-build -y + # sudo apt-get install libpixman-1-dev + + # wget https://download.qemu.org/qemu-7.0.0.tar.xz + # tar xvJf qemu-7.0.0.tar.xz + # cd qemu-7.0.0 + # ./configure + # make - wget https://download.qemu.org/qemu-7.0.0.tar.xz - tar xvJf qemu-7.0.0.tar.xz - cd qemu-7.0.0 - ./configure - make + # docker run --privileged --rm tonistiigi/binfmt --install all + # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes - docker run --privileged --rm tonistiigi/binfmt --install all + - name: See if segfault is removed + run: | docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes - name: Set up Docker Buildx From 4bcba9d3b40bc8fd959bb94447c7d5d1edf2f9b7 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Fri, 21 Feb 2025 11:22:23 -0600 Subject: [PATCH 10/10] Add back original version Signed-off-by: Ian Hoang --- .github/workflows/docker-build.yml | 17 +---------------- docker/Dockerfile | 12 +++--------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 69d1c2e9..3bf99f16 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -22,23 +22,8 @@ jobs: steps: - name: Set up QEMU uses: docker/setup-qemu-action@v3 - # - name: Run QEMU manual setup - # run: | - # sudo apt update && apt upgrade -y - # sudo apt install make -y - # sudo apt install ninja-build -y - # sudo apt-get install libpixman-1-dev - # wget https://download.qemu.org/qemu-7.0.0.tar.xz - # tar xvJf qemu-7.0.0.tar.xz - # cd qemu-7.0.0 - # ./configure - # make - - # docker run --privileged --rm tonistiigi/binfmt --install all - # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes - - - name: See if segfault is removed + - name: Address Libc-bin segfaults issue run: | docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes diff --git a/docker/Dockerfile b/docker/Dockerfile index 013bdd04..0a777952 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,15 +7,9 @@ # FROM python:3.11.2-slim AS build-stage -RUN apt-get update -y -RUN apt-get install -y curl -RUN apt-get install -y git -RUN apt-get install -y gcc -RUN apt-get install -y pbzip2 -RUN apt-get install -y pigz -RUN apt-get install -y make -RUN apt-get install -y jq -RUN apt-get -y upgrade +RUN apt-get -y update && \ + apt-get install -y curl git gcc pbzip2 pigz make jq && \ + apt-get -y upgrade COPY . opensearch-benchmark