Skip to content

Commit

Permalink
Merge pull request shipwright-io#1542 from shipwright-io/quay.io/cont…
Browse files Browse the repository at this point in the history
…ainers/buildah

Bump quay.io/containers/buildah from 1.34.0 to 1.35.0
  • Loading branch information
openshift-merge-bot[bot] authored Mar 18, 2024
2 parents a37f353 + 8a656e1 commit c7501d6
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions docs/buildstrategies.md
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ If we will apply the following resources:

```yaml
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand All @@ -854,7 +854,7 @@ If we will apply the following resources:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
privileged: true
command:
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/buildrun/resources/taskrun_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ var _ = Describe("GenerateTaskrun", func() {
})

It("should ensure IMAGE is replaced by builder image when needed.", func() {
Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.34.0"))
Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.0"))
})

It("should ensure ImagePullPolicy can be set by the build strategy author.", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
buildSteps:
- name: build
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
buildSteps:
- name: build-and-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
- name: s2i
mountPath: /s2i
- name: buildah
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: /s2i
securityContext:
privileged: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
steps:
- name: build
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
steps:
- name: build-and-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
- name: s2i
mountPath: /s2i
- name: buildah
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: /s2i
securityContext:
capabilities:
Expand Down
8 changes: 4 additions & 4 deletions test/v1alpha1_samples/buildstrategy_samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
emptyDir: {}
buildSteps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand All @@ -41,7 +41,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
capabilities:
add: ["SETFCAP"]
Expand Down Expand Up @@ -83,7 +83,7 @@ spec:
default: "vfs"
buildSteps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand Down Expand Up @@ -114,7 +114,7 @@ spec:
fieldRef:
fieldPath: "my-fieldpath"
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
capabilities:
add: ["SETFCAP"]
Expand Down
8 changes: 4 additions & 4 deletions test/v1alpha1_samples/clusterbuildstrategy_samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
default: "vfs"
buildSteps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand All @@ -48,7 +48,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
capabilities:
add: ["SETFCAP"]
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
default: "vfs"
buildSteps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
capabilities:
Expand All @@ -115,7 +115,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
capabilities:
add: ["SETFCAP"]
Expand Down
8 changes: 4 additions & 4 deletions test/v1beta1_samples/buildstrategy_samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
emptyDir: {}
steps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand All @@ -40,7 +40,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
privileged: true
command:
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
emptyDir: {}
steps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand Down Expand Up @@ -110,7 +110,7 @@ spec:
fieldRef:
fieldPath: "my-fieldpath"
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
privileged: true
command:
Expand Down
8 changes: 4 additions & 4 deletions test/v1beta1_samples/clusterbuildstrategy_samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
emptyDir: {}
steps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand All @@ -41,7 +41,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
privileged: true
command:
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
emptyDir: {}
steps:
- name: buildah-bud
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
workingDir: $(params.shp-source-root)
securityContext:
privileged: true
Expand All @@ -99,7 +99,7 @@ spec:
- name: buildah-images
mountPath: /var/lib/containers/storage
- name: buildah-push
image: quay.io/containers/buildah:v1.34.0
image: quay.io/containers/buildah:v1.35.0
securityContext:
privileged: true
command:
Expand Down

0 comments on commit c7501d6

Please sign in to comment.