Skip to content

Commit ea3e642

Browse files
chore: Update various dependencies.
* chore: delete webhooks (#9999) delete webhooks used to display what the docs would look like with a PR change * chore: bump github.com/cloudflare/circl from 1.6.1 to 1.6.3 (#9993) Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.6.1 to 1.6.3. - [Release notes](https://github.com/cloudflare/circl/releases) - [Commits](cloudflare/circl@v1.6.1...v1.6.3) --- updated-dependencies: - dependency-name: github.com/cloudflare/circl dependency-version: 1.6.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Migration to Kokoro instances (#9991) * debug migrating to Kokoro instances - pared down PR * switch to new project in presubmit.sh * pared down to just one test * tag skaffold-builder image with commit and push to AR * use buildx with --load * jib errors * remove wrong project * jib updates * chore: bump flask from 2.2.5 to 3.1.3 in /integration/examples/hot-reload/python (#9989) chore: bump flask in /integration/examples/hot-reload/python Bumps [flask](https://github.com/pallets/flask) from 2.2.5 to 3.1.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](pallets/flask@2.2.5...3.1.3) --- updated-dependencies: - dependency-name: flask dependency-version: 3.1.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump rack from 2.2.20 to 2.2.22 in /examples/ruby/backend (#9981) Bumps [rack](https://github.com/rack/rack) from 2.2.20 to 2.2.22. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.20...v2.2.22) --- updated-dependencies: - dependency-name: rack dependency-version: 2.2.22 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent cb2a7c0 commit ea3e642

File tree

26 files changed

+75
-839
lines changed

26 files changed

+75
-839
lines changed

Makefile

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,41 +153,45 @@ integration: install integration-tests
153153

154154
.PHONY: release
155155
release: $(BUILD_DIR)/VERSION
156-
docker build \
156+
docker buildx build \
157157
--build-arg VERSION=$(VERSION) \
158158
-f deploy/skaffold/Dockerfile \
159159
--target release \
160160
-t gcr.io/$(GCP_PROJECT)/skaffold:$(VERSION) \
161161
-t gcr.io/$(GCP_PROJECT)/skaffold:latest \
162+
--load \
162163
.
163164

164165
.PHONY: release-build
165166
release-build:
166-
docker build \
167+
docker buildx build \
167168
-f deploy/skaffold/Dockerfile \
168169
--target release \
169170
-t gcr.io/$(GCP_PROJECT)/skaffold:edge \
170171
-t gcr.io/$(GCP_PROJECT)/skaffold:$(COMMIT) \
172+
--load \
171173
.
172174

173175
.PHONY: release-lts
174176
release-lts: $(BUILD_DIR)/VERSION
175-
docker build \
177+
docker buildx build \
176178
--build-arg VERSION=$(VERSION) \
177179
-f deploy/skaffold/Dockerfile.lts \
178180
--target release \
179181
-t gcr.io/$(GCP_PROJECT)/skaffold:lts \
180182
-t gcr.io/$(GCP_PROJECT)/skaffold:$(VERSION)-lts \
181183
-t gcr.io/$(GCP_PROJECT)/skaffold:$(SCANNING_MARKER)-lts \
184+
--load \
182185
.
183186

184187
.PHONY: release-lts-build
185188
release-lts-build:
186-
docker build \
189+
docker buildx build \
187190
-f deploy/skaffold/Dockerfile.lts \
188191
--target release \
189192
-t gcr.io/$(GCP_PROJECT)/skaffold:edge-lts \
190193
-t gcr.io/$(GCP_PROJECT)/skaffold:$(COMMIT)-lts \
194+
--load \
191195
.
192196

193197
.PHONY: clean
@@ -197,30 +201,34 @@ clean:
197201
.PHONY: build_deps
198202
build_deps:
199203
$(eval DEPS_DIGEST := $(shell ./hack/skaffold-deps-sha1.sh))
200-
docker build \
204+
docker buildx build \
201205
-f deploy/skaffold/Dockerfile.deps \
202206
-t gcr.io/$(GCP_PROJECT)/build_deps:$(DEPS_DIGEST) \
207+
--load \
203208
deploy/skaffold
204209
docker push gcr.io/$(GCP_PROJECT)/build_deps:$(DEPS_DIGEST)
205210

206211
skaffold-builder-ci:
207-
docker build \
212+
docker buildx build \
208213
--cache-from gcr.io/$(GCP_PROJECT)/build_deps \
209214
-f deploy/skaffold/Dockerfile.deps \
210215
-t gcr.io/$(GCP_PROJECT)/build_deps \
216+
--load \
211217
.
212-
time docker build \
218+
time docker buildx build \
213219
-f deploy/skaffold/Dockerfile \
214220
--target builder \
215221
-t gcr.io/$(GCP_PROJECT)/skaffold-builder \
222+
--load \
216223
.
217224

218225
.PHONY: skaffold-builder
219226
skaffold-builder:
220-
time docker build \
227+
time docker buildx build \
221228
-f deploy/skaffold/Dockerfile \
222229
--target builder \
223230
-t gcr.io/$(GCP_PROJECT)/skaffold-builder \
231+
--load \
224232
.
225233

226234
.PHONY: integration-in-kind
@@ -276,6 +284,12 @@ integration-in-k3d: skaffold-builder
276284
make integration \
277285
'
278286

287+
# Prevent Jib (Maven/Gradle) from crashing on Kokoro.
288+
# Kokoro is a "clean" environment and doesn't have a Maven settings file (~/.m2/settings.xml).
289+
# When Skaffold tries to sync that non-existent file into a Docker container, Docker
290+
# mistakenly creates a FOLDER named 'settings.xml' instead. Jib then crashes because
291+
# it can't read a folder as a configuration file.
292+
# Pointing home to /tmp avoids this file-vs-folder conflict.
279293
.PHONY: integration-in-docker
280294
integration-in-docker: skaffold-builder-ci
281295
docker run --rm \
@@ -291,6 +305,8 @@ integration-in-docker: skaffold-builder-ci
291305
-e GOOGLE_APPLICATION_CREDENTIALS=$(GOOGLE_APPLICATION_CREDENTIALS) \
292306
-e INTEGRATION_TEST_ARGS=$(INTEGRATION_TEST_ARGS) \
293307
-e IT_PARTITION=$(IT_PARTITION) \
308+
-e MAVEN_OPTS="-Duser.home=/tmp" \
309+
-e GRADLE_USER_HOME="/tmp/.gradle" \
294310
gcr.io/$(GCP_PROJECT)/skaffold-builder \
295311
make integration-tests
296312

deploy/webhook-v2/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

deploy/webhook-v2/cloudbuild.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

deploy/webhook-v2/deployment.yaml

Lines changed: 0 additions & 56 deletions
This file was deleted.

deploy/webhook-v2/skaffold.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

deploy/webhook/Dockerfile

Lines changed: 0 additions & 56 deletions
This file was deleted.

deploy/webhook/cloudbuild.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)