circleci: update integration tests to use kind v0.19 and docker-compo…

…se v2.18.1 (#6122)

Signed-off-by: Nick Santos <[email protected]>

.circleci/Dockerfile.integration

@@ -37,7 +37,7 @@ RUN curl -fL "https://github.com/docker/compose/releases/download/${DOCKER_COMPO
   && docker-compose-v1 version
 
 # docker-compose v2
-ARG DOCKER_COMPOSE_V2_VERSION=v2.11.0
+ARG DOCKER_COMPOSE_V2_VERSION=v2.18.1
 RUN curl -fL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_V2_VERSION}/docker-compose-$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)" -o /usr/local/bin/docker-compose \
   && chmod a+x /usr/local/bin/docker-compose \
   && docker-compose version
@@ -47,7 +47,7 @@ RUN go install gotest.tools/gotestsum@latest \
     && gotestsum --version
 
 # install Kind (Kubernetes in Docker)
-ENV KIND_VERSION=v0.16.0
+ENV KIND_VERSION=v0.19.0
 RUN curl -fLo ./kind-linux-amd64 https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64 \
   && chmod +x ./kind-linux-amd64 \
   && mv ./kind-linux-amd64 /go/bin/kind \

.circleci/config.yml

@@ -89,7 +89,7 @@ jobs:
   build-integration:
     resource_class: medium+
     docker:
-      - image: docker/tilt-integration-ci@sha256:0c9180c7ad07a6d1ce318f64dad2df83ad2d5ace03450f05543dbd3c07a02979
+      - image: docker/tilt-integration-ci@sha256:51ee8a14da68c9dc5812d7a6fbfc893970666b0fd0fe12d848d95d4e9a0f816e
     steps:
       - checkout
       - run: echo 'export PATH=/go/bin:$PATH' >> $BASH_ENV

Makefile

@@ -129,12 +129,10 @@ release-container:
 	scripts/build-tilt-releaser.sh
 
 ci-container:
-	docker buildx build --load --pull --platform linux/amd64 -t docker/tilt-ci -f .circleci/Dockerfile .circleci
-	docker push docker/tilt-ci
+	docker buildx build --push --pull --platform linux/amd64 -t docker/tilt-ci -f .circleci/Dockerfile .circleci
 
 ci-integration-container:
-	docker buildx build --load --pull --platform linux/amd64 -t docker/tilt-integration-ci -f .circleci/Dockerfile.integration .circleci
-	docker push docker/tilt-integration-ci
+	docker buildx build --push --pull --platform linux/amd64 -t docker/tilt-integration-ci -f .circleci/Dockerfile.integration .circleci
 
 clean:
 	go clean -cache -testcache -r -i ./...