diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74ba63641..fb7a658c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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 diff --git a/images/base-alt-p10/werf.inc.yaml b/images/base-alt-p10/werf.inc.yaml index 2b43e1900..36e807dce 100644 --- a/images/base-alt-p10/werf.inc.yaml +++ b/images/base-alt-p10/werf.inc.yaml @@ -1,5 +1,6 @@ --- image: {{ $.ImageName }} +final: false from: {{ $.Images.BASE_ALT_P10 }} shell: setup: diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml index 40631c7fb..8e9ed0597 100644 --- a/images/virt-launcher/werf.inc.yaml +++ b/images/virt-launcher/werf.inc.yaml @@ -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: @@ -214,6 +215,7 @@ shell: - make && make install --- image: {{ $.ImageName }}-openssl-builder +final: false fromImage: {{ $.ImageName }}-lib-builder shell: beforeInstall: @@ -226,6 +228,7 @@ shell: - make && make install --- image: {{ $.ImageName }}-pcre-builder +final: false fromImage: {{ $.ImageName }}-lib-builder shell: beforeInstall: @@ -239,6 +242,7 @@ shell: - make && make install --- image: {{ $.ImageName }}-liboverride-builder +final: false fromImage: {{ $.ImageName }}-lib-builder git: - add: /images/{{ $.ImageName }}/liboverride @@ -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 diff --git a/images/virtualization-artifact/werf.inc.yaml b/images/virtualization-artifact/werf.inc.yaml index cab7b632f..7da7df5e4 100644 --- a/images/virtualization-artifact/werf.inc.yaml +++ b/images/virtualization-artifact/werf.inc.yaml @@ -1,5 +1,6 @@ --- image: {{ $.ImageName }} +final: false from: {{ .Images.BASE_GOLANG_21_BOOKWORM }} git: - add: /api @@ -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 - - - diff --git a/werf.yaml b/werf.yaml index 4e9ee3f78..05c2867f2 100644 --- a/werf.yaml +++ b/werf.yaml @@ -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 }} @@ -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