diff options
| -rw-r--r-- | screwdriver.yaml | 10 | ||||
| -rwxr-xr-x | screwdriver/release-container-image-docker.sh | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index 783777c0b51..718b0fdcd4c 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -341,6 +341,7 @@ jobs: fi publish-el9-preview: + requires: [~pr] image: docker.io/vespaengine/vespa-build-centos-stream8:latest annotations: screwdriver.cd/cpu: 7 @@ -381,21 +382,16 @@ jobs: docker context use vespa-context docker buildx create --name vespa-builder --driver docker-container --use docker buildx inspect --bootstrap - docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" docker buildx build \ --progress plain \ --load \ - --platform linux/amd64,linux/arm64 \ + --platform linux/amd64 \ --build-arg VESPA_BASE_IMAGE=el9 \ --build-arg VESPA_VERSION=$VESPA_VERSION \ --file Dockerfile \ - --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION \ - --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_MAJOR \ - --tag docker.io/vespaengine/$IMAGE_NAME:latest \ + --tag vespaengine/$IMAGE_NAME:latest \ . - verify-container-image: | - # Trick to be able to use the documentation testing to verify the image built locally - buildah tag $IMAGE_NAME:$VESPA_VERSION vespaengine/vespa:latest # Run quick start guide $SD_SOURCE_DIR/screwdriver/test-quick-start-guide.sh - publish-image: | diff --git a/screwdriver/release-container-image-docker.sh b/screwdriver/release-container-image-docker.sh index 6d8babe3dcc..46786bf8dc9 100755 --- a/screwdriver/release-container-image-docker.sh +++ b/screwdriver/release-container-image-docker.sh @@ -61,6 +61,14 @@ for data in "Dockerfile vespa"; do if curl -fsSL https://index.docker.io/v1/repositories/vespaengine/$IMAGE_NAME/tags/$VESPA_VERSION &> /dev/null; then echo "Container image docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION aldready exists." else + # Build only for x86_64 first for test as BuildKit does not support loading multi arch into docker daemon. + docker buildx build --progress plain --load --platform linux/amd64 --build-arg VESPA_VERSION=$VESPA_VERSION \ + --file $DOCKER_FILE --tag vespaengine/$IMAGE_NAME:latest . + + # Test + $SD_SOURCE_DIR/screwdriver/test-quick-start-guide.sh + + # Build for arm64 and publish docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" docker buildx build --progress plain --push --platform linux/amd64,linux/arm64 --build-arg VESPA_VERSION=$VESPA_VERSION \ --file $DOCKER_FILE --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION \ |