feat: add buildx command to build dev docker image\nLet's see if this…

… just works. Otherwise, I'm going to have to figure out arm64 or Drivah
elastic · Sep 13, 2024 · f0152b5 · f0152b5
1 parent 0206547
commit f0152b5
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/.buildkite/dev-docker/pipeline.yml b/.buildkite/dev-docker/pipeline.yml
@@ -6,7 +6,7 @@ steps:
         default: "master"
         hint: "The branch to build from e.g. 'master'."
   - wait
-  - label: "Release Docker Artifacts for Rally"
+  - label: "Build Docker Artifacts for Rally"
     command: bash .buildkite/docker-dev/run.sh
     # Run on GCP to use `docker`
     agents:

diff --git a/.buildkite/dev-docker/run.sh b/.buildkite/dev-docker/run.sh
@@ -22,7 +22,7 @@ git --no-pager show
 set -x
 export TERM=dumb
 export LC_ALL=en_US.UTF-8
-./release-docker.sh "$BUILD_FROM_BRANCH"
+./build-dev-docker.sh "$BUILD_FROM_BRANCH"
 
 popd
 popd

diff --git a/build-dev-docker.sh b/build-dev-docker.sh
@@ -52,7 +52,7 @@ echo "========================================================"
 echo "Building Docker image for Rally $RALLY_VERSION          "
 echo "========================================================"
 
-docker build -t elastic/rally:${RALLY_VERSION} --build-arg RALLY_VERSION --build-arg RALLY_LICENSE -f docker/Dockerfiles/Dockerfile-dev $PWD
+docker buildx build -t elastic/rally:${RALLY_VERSION} --build-arg RALLY_VERSION --build-arg RALLY_LICENSE --platform=linux/amd64,linux/arm64 -f docker/Dockerfiles/dev/Dockerfile $PWD
 
 echo "======================================================="
 echo "Testing Docker image for Rally release $RALLY_VERSION  "

diff --git a/docker/Dockerfiles/Dockerfile-dev → docker/Dockerfiles/dev/Dockerfile b/docker/Dockerfiles/Dockerfile-dev → docker/Dockerfiles/dev/Dockerfile
diff --git a/docker/Dockerfiles/Dockerfile-release → docker/Dockerfiles/release/Dockerfile b/docker/Dockerfiles/Dockerfile-release → docker/Dockerfiles/release/Dockerfile
diff --git a/it/__init__.py b/it/__init__.py
@@ -250,7 +250,7 @@ def build_docker_image():
 
     command = (
         f"docker build -t elastic/rally:{rally_version} --build-arg RALLY_VERSION --build-arg RALLY_LICENSE "
-        f"-f {ROOT_DIR}/docker/Dockerfiles/Dockerfile-dev {ROOT_DIR}"
+        f"-f {ROOT_DIR}/docker/Dockerfiles/dev/Dockerfile {ROOT_DIR}"
     )
 
     if process.run_subprocess_with_logging(command, env=env_variables) != 0:

diff --git a/release-docker.sh b/release-docker.sh
@@ -40,7 +40,7 @@ echo "========================================================"
 echo "Building Docker image for Rally release $RALLY_VERSION  "
 echo "========================================================"
 
-docker build -t elastic/rally:${RALLY_VERSION} --build-arg RALLY_VERSION --build-arg RALLY_LICENSE -f docker/Dockerfiles/Dockerfile-release $PWD
+docker build -t elastic/rally:${RALLY_VERSION} --build-arg RALLY_VERSION --build-arg RALLY_LICENSE -f docker/Dockerfiles/release/Dockerfile $PWD
 
 echo "======================================================="
 echo "Testing Docker image for Rally release $RALLY_VERSION  "