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.

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

chore(module): remove builders and artifacts from images_digests.json #379

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,16 @@ The first thing we recommend is to check the existing [issues](https://github.co
- Follow [the commit message convention](#commit-message).
- Sign off every commit you contributed as an acknowledgment of the [DCO](https://developercertificate.org/).

7. Push commits.
7. Push commits.

8. Create a pull request following the [pull request name convention](#pull-request-name).

## Images

The module images are located in the ./images directory.

Images, such as build images or images with binary artifacts, should not be included in the module. To do so, they must be labeled as follows in the `werf.inc.yaml` file: `final: false`.

## Conventions

### Commit message
Expand Down Expand Up @@ -112,7 +118,7 @@ Supported scopes are the following:
# User metrics, alerts, dashboards, and logs that provide insights into system performance and health.
- observability

# Maintaining, improving code quality and development workflow.
# Maintaining, improving code quality and development workflow.
- ci
- lint
- format
Expand Down
1 change: 1 addition & 0 deletions images/base-alt-p10/werf.inc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
image: {{ $.ImageName }}
final: false
from: {{ $.Images.BASE_ALT_P10 }}
shell:
setup:
Expand Down
5 changes: 5 additions & 0 deletions images/virt-launcher/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ shell:
gcc-c++==10-alt1:sisyphus+263054.200.3.1
---
image: {{ $.ImageName }}-libxcrypt-builder
final: false
fromImage: {{ $.ImageName }}-lib-builder
shell:
beforeInstall:
Expand All @@ -214,6 +215,7 @@ shell:
- make && make install
---
image: {{ $.ImageName }}-openssl-builder
final: false
fromImage: {{ $.ImageName }}-lib-builder
shell:
beforeInstall:
Expand All @@ -226,6 +228,7 @@ shell:
- make && make install
---
image: {{ $.ImageName }}-pcre-builder
final: false
fromImage: {{ $.ImageName }}-lib-builder
shell:
beforeInstall:
Expand All @@ -239,6 +242,7 @@ shell:
- make && make install
---
image: {{ $.ImageName }}-liboverride-builder
final: false
fromImage: {{ $.ImageName }}-lib-builder
git:
- add: /images/{{ $.ImageName }}/liboverride
Expand All @@ -257,6 +261,7 @@ shell:
---
# Note: edk2-ovmf==20231115 requires p11 AltLinux to build.
image: {{ $.ImageName }}-edk2-builder
final: false
from: {{ $.Images.BASE_ALT_P11 }}
git:
- add: /images/{{ $.ImageName }}/edk2
Expand Down
4 changes: 1 addition & 3 deletions images/virtualization-artifact/werf.inc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
image: {{ $.ImageName }}
final: false
from: {{ .Images.BASE_GOLANG_21_BOOKWORM }}
git:
- add: /api
Expand Down Expand Up @@ -33,6 +34,3 @@ shell:
- export GOARCH=amd64
- go build -v -a -o virtualization-controller ./cmd/virtualization-controller
- go build -v -a -o virtualization-api ./cmd/virtualization-api



8 changes: 5 additions & 3 deletions werf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ dockerfile: Dockerfile
{{- range $ImageYamlMainfest := regexSplit "\n?---[ \t]*\n" (include "module_image_template" $ctx) -1 }}

{{- $ImageManifest := $ImageYamlMainfest | fromYaml }}
{{- if $ImageManifest.image }}
{{- $ImagesIDList = append $ImagesIDList $ImageManifest.image }}
{{- if $ImageManifest | dig "final" true }}
{{- if $ImageManifest.image }}
{{- $ImagesIDList = append $ImagesIDList $ImageManifest.image }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -106,7 +108,7 @@ shell:
---
image: bundle
from: {{ .Images.BASE_SCRATCH }}
fromCacheVersion: "2024-02-15.1"
fromCacheVersion: "2024-09-17.0"
import:
- image: images-digests
add: /images_digests.json
Expand Down
Loading