Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build errors related to builder image #153

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Fix build errors related to builder image #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7518ec
Reduce rebuilding by not triggering build on new builder image version
jameshochadel Dec 11, 2024
2332857
Fix external pipelines failing due to missing builder image input
jameshochadel Dec 11, 2024
9eb6df9
Fix csb-dockerproxy using wrong Dockerfile in repo root
jameshochadel Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/container/internal/base_vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ builder-image: ubuntu-hardened
builder-image-tag: latest
oci-build-params: {}
common-pipelines-trigger: false
# Defaults to the root of the source repo if unspecified.
dockerfile-path: []
dockerfile-trigger: false
static-analysis-cmd: echo
Expand Down
1 change: 1 addition & 0 deletions ci/container/internal/csb-docproxy/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ builder-image-tag: latest
image-repository: csb-docproxy
src-repo: cloud-gov/csb
src-branch: brokerpak-topic
dockerfile-path: ["docproxy/Dockerfile"]
1 change: 1 addition & 0 deletions container/oci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ inputs:
- name: src
- name: base-image
- name: builder-image
optional: true
- name: common-pipelines
- name: common-dockerfiles

Expand Down
4 changes: 2 additions & 2 deletions container/pipeline-internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
trigger: true

- get: builder-image
trigger: true
trigger: false
params:
format: oci

Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
format: oci

- get: builder-image
trigger: true
trigger: false
params:
format: oci

Expand Down