diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2023-03-09 10:30:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 10:30:14 +0100 |
| commit | a7a92a49a4e52c6153b0deddcb243e49e743a74d (patch) | |
| tree | 130d56762f770f0e43cc79f0db2c2b87da7bd94e /screwdriver.yaml | |
| parent | 1ff513821015fc87ab078d53075e5be41f8f73af (diff) | |
| parent | 48127d9a1cba930ac2e39af869e4bac26a321e07 (diff) | |
Merge pull request #26372 from vespa-engine/aressem/test-docker
Use buildah so we can squash the container image
Diffstat (limited to 'screwdriver.yaml')
| -rw-r--r-- | screwdriver.yaml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index ab911b9f0be..a43abbafa54 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -244,9 +244,6 @@ jobs: screwdriver.cd/ram: 16 screwdriver.cd/disk: HIGH screwdriver.cd/timeout: 300 - screwdriver.cd/dockerEnabled: true - screwdriver.cd/dockerCpu: TURBO - screwdriver.cd/dockerRam: HIGH screwdriver.cd/buildPeriodically: H 6 1 * * environment: @@ -264,9 +261,8 @@ jobs: return 1 fi - install-dependencies: | - dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - dnf install -y docker-ce docker-ce-cli containerd.io - docker system info + dnf install -y podman podman-docker buildah skopeo + touch /etc/containers/nodocker - checkout: | mkdir -p workdir cd workdir @@ -296,11 +292,11 @@ jobs: RUN --mount=type=bind,target=/rpms/,source=. dnf reinstall -y /rpms/vespa*rpm && dnf clean all USER vespa EOF - docker build --progress plain --build-arg VESPA_VERSION=$VESPA_VERSION --tag docker.io/$IMAGE_NAME:$VESPA_VERSION \ + buildah bud --security-opt label=disable --network host --squash --build-arg VESPA_VERSION=$VESPA_VERSION --tag docker.io/$IMAGE_NAME:$VESPA_VERSION \ --tag docker.io/$IMAGE_NAME:latest --file Dockerfile . - verify-container-image: | # Trick to be able to use the documentation testing to verify the image built locally - docker tag docker.io/$IMAGE_NAME:$VESPA_VERSION vespaengine/vespa:latest + buildah tag docker.io/$IMAGE_NAME:$VESPA_VERSION vespaengine/vespa:latest # Clone and setup doc tests git clone -q --depth 1 https://github.com/vespa-engine/documentation cd documentation @@ -319,10 +315,10 @@ jobs: else OPT_STATE="$(set +o)" set +x - docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" + buildah login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" docker.io eval "$OPT_STATE" - docker push docker.io/$IMAGE_NAME:$VESPA_VERSION - docker push docker.io/$IMAGE_NAME:latest + buildah push --format v2s2 docker.io/$IMAGE_NAME:$VESPA_VERSION docker://docker.io/$IMAGE_NAME:$VESPA_VERSION + buildah push --format v2s2 docker.io/$IMAGE_NAME:$VESPA_VERSION docker://docker.io/$IMAGE_NAME:latest fi fi |