Skip to content

Commit

Permalink
build: move arm64 image to wolfi-base (#433)
Browse files Browse the repository at this point in the history
### Summary

Updates the `arm64` image to use `wolfi-base` instead of `rockylinux`
and consolidates the `amd64` and `arm64` images into the same
Dockerfile. As of this PR, the `amd64` and `arm64` images for the API
are at parity.

### Testing

Successful docker build on the feature branch can be seen in [this
job](https://github.com/Unstructured-IO/unstructured-api/actions/runs/9875409234/job/27272072089).
  • Loading branch information
MthwRobinson authored Jul 10, 2024
1 parent 35d5b37 commit a2d5a5a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# Clear some space (https://github.com/actions/runner-images/issues/2840)
sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/share/boost
DOCKER_BUILDKIT=1 docker buildx build --load -f Dockerfile-${{ matrix.arch }} \
DOCKER_BUILDKIT=1 docker buildx build --load -f Dockerfile \
--platform=$DOCKER_PLATFORM \
--build-arg PIP_VERSION=$PIP_VERSION \
--build-arg BUILDKIT_INLINE_CACHE=1 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-amd64 → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:experimental
FROM quay.io/unstructured-io/base-images:wolfi-base@sha256:7c3af225a39f730f4feee705df6cd8d1570739dc130456cf589ac53347da0f1d as base
FROM quay.io/unstructured-io/base-images:wolfi-base-e48da6b@sha256:8ad3479e5dc87a86e4794350cca6385c01c6d110902c5b292d1a62e231be711b as base

# NOTE(crag): NB_USER ARG for mybinder.org compat:
# https://mybinder.readthedocs.io/en/latest/tutorials/dockerfile.html
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DOCKER_PLATFORM="${DOCKER_PLATFORM:-}"


DOCKER_BUILD_CMD=(
docker buildx build --load -f Dockerfile-amd64
docker buildx build --load -f Dockerfile
--build-arg PIP_VERSION="$PIP_VERSION"
--build-arg BUILDKIT_INLINE_CACHE=1
--build-arg PIPELINE_PACKAGE="$PIPELINE_PACKAGE"
Expand Down

0 comments on commit a2d5a5a

Please sign in to comment.