Skip to content
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
1 change: 0 additions & 1 deletion images/cdi-artifact/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
echo "Git clone CDI repository..."
git clone --depth 1 --branch {{ $version }} $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} /src/containerized-data-importer

Expand Down
7 changes: 2 additions & 5 deletions images/dvcr/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ secrets:
value: {{ $.SOURCE_REPO_GIT }}
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
echo "Git clone CDI repository..."
git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /distribution
- git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src

---
image: {{ .ModuleNamePrefix }}{{ .ImageName }}
Expand Down Expand Up @@ -43,7 +40,7 @@ mount:
to: /go/pkg
import:
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /distribution
add: /src
to: /distribution
before: install
secrets:
Expand Down
42 changes: 15 additions & 27 deletions images/edk2/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ final: false
fromImage: builder/src
git:
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
to: /
to: /src
includePaths: build.sh
stageDependencies:
install:
- build.sh
- add: {{ .ModuleDir }}/images/{{ .ImageName }}/logo
to: /
to: /src
includePaths: Logo.bmp
stageDependencies:
install:
- '**/*'
- add: {{ .ModuleDir }}/images/{{ .ImageName }}/json
to: /FIRMWARE
to: /src/FIRMWARE
includePaths:
- '*.json'
stageDependencies:
install:
- '*.json'
- add: {{ .ModuleDir }}/images/{{ .ImageName }}/uefi-revocation-list
to: /FIRMWARE
to: /src/FIRMWARE
includePaths:
- '*.bin'
stageDependencies:
Expand All @@ -64,16 +64,15 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

cd /src
echo "Git clone Edk2 repository..."
git clone \
--depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} \
--branch {{ $gitRepoName }}-{{ $version }} /{{ $gitRepoName }}-{{ $version }}
--branch {{ $gitRepoName }}-{{ $version }} {{ $gitRepoName }}-{{ $version }}

git clone $(cat /run/secrets/SOURCE_REPO)/tianocore/edk2-platforms.git

cd /{{ $gitRepoName }}-{{ $version }}
cd {{ $gitRepoName }}-{{ $version }}

if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
echo "Checkout submodules"
Expand All @@ -95,25 +94,15 @@ final: false
fromImage: builder/alt
import:
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /{{ $gitRepoName }}-{{ $version }}
to: /{{ $gitRepoName }}-{{ $version }}
before: install
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /edk2-platforms
to: /edk2-platforms
before: install
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /FIRMWARE
to: /FIRMWARE
before: install
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /Logo.bmp
to: /Logo.bmp
before: install
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /build.sh
to: /build.sh
add: /src
to: /
before: install
includePaths:
- "{{ $gitRepoName }}-{{ $version }}"
- edk2-platforms
- FIRMWARE
- Logo.bmp
- build.sh
{{- $images := list "libisoburn" "libburn" -}}
{{- include "importPackageImages" (list . $images "install") -}}
- image: {{ .ModuleNamePrefix }}qemu
Expand Down Expand Up @@ -156,4 +145,3 @@ shell:
setup:
- |
/build.sh --repo-name {{ $gitRepoName }} --branch {{ $version }}

4 changes: 2 additions & 2 deletions images/hooks/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ final: false
fromImage: builder/src
git:
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
to: /app/images/hooks
to: /src
stageDependencies:
install:
- go.mod
Expand All @@ -16,7 +16,7 @@ final: false
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
import:
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /app/images/hooks
add: /src
to: /app/images/hooks
before: install
mount:
Expand Down
10 changes: 4 additions & 6 deletions images/libvirt/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
final: false
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/src" "builder/alt-go-svace" }}
fromImage: builder/src
git:
- add: {{ .ModuleDir }}/images/{{ .ImageName }}
to: /
Expand All @@ -23,11 +23,9 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /{{ $gitRepoName }}-{{ $version }}
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src/{{ $gitRepoName }}-{{ $version }}

cd /{{ $gitRepoName }}-{{ $version }}
cd /src/{{ $gitRepoName }}-{{ $version }}

if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
echo "Checkout submodules"
Expand Down Expand Up @@ -101,7 +99,7 @@ final: false
fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
import:
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
add: /{{ $gitRepoName }}-{{ $version }}
add: /src/{{ $gitRepoName }}-{{ $version }}
to: /{{ $gitRepoName }}-{{ $version }}
before: install
- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
Expand Down
2 changes: 0 additions & 2 deletions images/packages/acl/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

---
Expand Down
2 changes: 0 additions & 2 deletions images/packages/bzip2/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

---
Expand Down
2 changes: 0 additions & 2 deletions images/packages/dmidecode/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
3 changes: 1 addition & 2 deletions images/packages/dtc/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
2 changes: 0 additions & 2 deletions images/packages/file/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
---

Expand Down
2 changes: 0 additions & 2 deletions images/packages/gcc/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

---
Expand Down
2 changes: 0 additions & 2 deletions images/packages/glib2/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ shell:

install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

if [[ ! "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
Expand Down
2 changes: 0 additions & 2 deletions images/packages/glibc/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
2 changes: 0 additions & 2 deletions images/packages/gnutls/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

cd /src
Expand Down
2 changes: 0 additions & 2 deletions images/packages/libattr/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
2 changes: 0 additions & 2 deletions images/packages/libaudit/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
2 changes: 0 additions & 2 deletions images/packages/libblkid/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
1 change: 0 additions & 1 deletion images/packages/libbrotli/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config

git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

Expand Down
3 changes: 1 addition & 2 deletions images/packages/libbsd/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
3 changes: 1 addition & 2 deletions images/packages/libburn/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
3 changes: 1 addition & 2 deletions images/packages/libfuse3/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
3 changes: 1 addition & 2 deletions images/packages/libgcrypt/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
rm -rf /src/.git

Expand Down
3 changes: 1 addition & 2 deletions images/packages/libgmp/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config


git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src


Expand Down
1 change: 0 additions & 1 deletion images/packages/libgpg-error/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

---
Expand Down
2 changes: 0 additions & 2 deletions images/packages/libgsasl/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

cd /src
GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
cd gnulib
git checkout $GNULIB_REVISION
cd /

---
{{- $name := print $.ImageName "-dependencies" -}}
Expand Down
2 changes: 0 additions & 2 deletions images/packages/libidn/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

cd /src
GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
cd gnulib
git checkout $GNULIB_REVISION
cd /

---
image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}-builder
Expand Down
2 changes: 0 additions & 2 deletions images/packages/libidn2/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ secrets:
shell:
install:
- |
mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src

cd /src
GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
git clone $(cat /run/secrets/SOURCE_REPO)/gnulib.git ./gnulib
cd gnulib
git checkout $GNULIB_REVISION
cd /

---

Expand Down
Loading
Loading