Skip to content

Commit

Permalink
fix(scripts): Remove --build-context options from docker build
Browse files Browse the repository at this point in the history
This works around [1]. The removal should not be a performance issue as
the contexts are named after the stages, which should have been built
anyway. Also see [2] which states that "When Dockerfile defines a stage
with the same name it is overwritten", in other words without the
explicit context the stage is used.

[1]: https://codeberg.org/devthefuture/dockerfile-x/issues/4
[2]: https://docs.docker.com/reference/cli/docker/buildx/build/#build-context

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed May 23, 2024
1 parent bffec69 commit 5792b47
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions scripts/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ image_build python ort/python "$PYTHON_VERSION" \
--build-arg PYTHON_POETRY_VERSION="$PYTHON_POETRY_VERSION" \
--build-arg PIPTOOL_VERSION="$PIPTOOL_VERSION" \
--build-arg SCANCODE_VERSION="$SCANCODE_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Nodejs
Expand All @@ -80,87 +79,63 @@ image_build nodejs ort/nodejs "$NODEJS_VERSION" \
--build-arg NPM_VERSION="$NPM_VERSION" \
--build-arg PNPM_VERSION="$PNPM_VERSION" \
--build-arg YARN_VERSION="$YARN_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Rust
image_build rust ort/rust "$RUST_VERSION" \
--build-arg RUST_VERSION="$RUST_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Ruby
image_build ruby ort/ruby "$RUBY_VERSION" \
--build-arg RUBY_VERSION="$RUBY_VERSION" \
--build-arg COCOAPODS_VERSION="$COCOAPODS_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Golang
image_build golang ort/golang "$GO_VERSION" \
--build-arg GO_VERSION="$GO_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Runtime ORT image
image_build minimal ort-minimal "$ORT_VERSION" \
--build-arg ORT_VERSION="$ORT_VERSION" \
--build-arg NODEJS_VERSION="$NODEJS_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
--build-context "python=docker-image://${DOCKER_IMAGE_ROOT}/ort/python:latest" \
--build-context "nodejs=docker-image://${DOCKER_IMAGE_ROOT}/ort/nodejs:latest" \
--build-context "rust=docker-image://${DOCKER_IMAGE_ROOT}/ort/rust:latest" \
--build-context "golang=docker-image://${DOCKER_IMAGE_ROOT}/ort/golang:latest" \
--build-context "ruby=docker-image://${DOCKER_IMAGE_ROOT}/ort/ruby:latest" \
"$@"

# Android
# shellcheck disable=SC1091
image_build android ort/android "$ANDROID_CMD_VERSION" \
--build-arg ANDROID_CMD_VERSION="$ANDROID_CMD_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Swift
image_build swift ort/swift "$SWIFT_VERSION" \
--build-arg SWIFT_VERSION="$SWIFT_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# SBT
image_build scala ort/scala "$SBT_VERSION" \
--build-arg SBT_VERSION="$SBT_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Dart
image_build dart ort/dart "$DART_VERSION" \
--build-arg DART_VERSION="$DART_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Dotnet
image_build dotnet ort/dotnet "$DOTNET_VERSION" \
--build-arg DOTNET_VERSION="$DOTNET_VERSION" \
--build-arg NUGET_INSPECTOR_VERSION="$NUGET_INSPECTOR_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Haskell
image_build haskell ort/haskell "$HASKELL_STACK_VERSION" \
--build-arg HASKELL_STACK_VERSION="$HASKELL_STACK_VERSION" \
--build-context "base=docker-image://${DOCKER_IMAGE_ROOT}/ort/base:latest" \
"$@"

# Main runtime ORT image
image_build run ort "$ORT_VERSION" \
--build-arg ORT_VERSION="$ORT_VERSION" \
--build-context "minimal=docker-image://${DOCKER_IMAGE_ROOT}/ort-minimal:${ORT_VERSION}" \
--build-context "sbt=docker-image://${DOCKER_IMAGE_ROOT}/ort/sbt:latest" \
--build-context "dotnet=docker-image://${DOCKER_IMAGE_ROOT}/ort/dotnet:latest" \
--build-context "swift=docker-image://${DOCKER_IMAGE_ROOT}/ort/swift:latest" \
--build-context "android=docker-image://${DOCKER_IMAGE_ROOT}/ort/android:latest" \
--build-context "dart=docker-image://${DOCKER_IMAGE_ROOT}/ort/dart:latest" \
--build-context "haskell=docker-image://${DOCKER_IMAGE_ROOT}/ort/haskell:latest" \
--build-context "scala=docker-image://${DOCKER_IMAGE_ROOT}/ort/scala:latest" \
"$@"

0 comments on commit 5792b47

Please sign in to comment.