Skip to content

Commit 065fd90

Browse files
Merge branch 'werf:main' into main
2 parents 047fe22 + 426feeb commit 065fd90

File tree

121 files changed

+459
-508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+459
-508
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions

integration/suites/ansible/apt_key1-001/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project: ansible-apt-key1
22
configVersion: 1
33
---
44
image: ~
5-
from: ubuntu:18.04
5+
from: registry.werf.io/base/ubuntu:22.04
66
ansible:
77
beforeInstall:
88
- name: Install ca-certificates

integration/suites/ansible/apt_key1-002/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project: ansible-apt-key1
22
configVersion: 1
33
---
44
image: ~
5-
from: ubuntu:18.04
5+
from: registry.werf.io/base/ubuntu:22.04
66
ansible:
77
beforeInstall:
88
- name: Install ca-certificates

integration/suites/ansible/apt_key2/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project: ansible-apt-key2
55
configVersion: 1
66
---
77
image: ~
8-
from: ubuntu:18.04
8+
from: registry.werf.io/base/ubuntu:22.04
99
ansible:
1010
install:
1111
- name: Add an apt key by id from a keyserver
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
configVersion: 1
22
project: ansible-apt-mark-panic-1820
33

4-
{{- range $_, $fromImg := (list "ubuntu:16.04" "ubuntu:18.04") }}
54
---
6-
image: {{ $fromImg | replace ":" "-" | replace "." "-" }}
7-
from: {{ $fromImg }}
5+
image: ubuntu-22-04
6+
from: registry.werf.io/base/ubuntu:22.04
87
ansible:
98
install:
109
- name: Install essential utils
1110
apt:
1211
name: apt-transport-https
1312
update_cache: yes
14-
{{- end }}

integration/suites/ansible/become_user/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ configVersion: 1
22
project: ansible-become-user
33
---
44
image: ~
5-
from: ubuntu:18.04
5+
from: registry.werf.io/base/ubuntu:22.04
66
ansible:
77
install:
88
- group:

integration/suites/ansible/general/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project: ansible-general
33
{{- range $_, $fromImg := (list "alpine" "ubuntu") }}
44
---
55
image: {{ $fromImg }}-test
6-
from: {{ $fromImg }}
6+
from: registry.werf.io/base/{{ $fromImg }}
77
ansible:
88
install:
99
- name: download archive

integration/suites/ansible/path_redefined_in_stapel_1836/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ configVersion: 1
22
project: ansible-path-redefined
33
---
44
image: ~
5-
from: golang:1.12-alpine3.9
5+
from: registry.werf.io/base/golang:1.12-alpine3.9
66
ansible:
77
install:
88
- shell: go version

integration/suites/ansible/python_encoding/werf.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ configVersion: 1
22
project: ansible-python-encoding
33
---
44
image: ubuntu-python3
5-
from: ubuntu:18.04
5+
from: registry.werf.io/base/ubuntu:22.04
66
git:
77
{{ include "appGit" . }}
88
ansible:
@@ -21,7 +21,7 @@ ansible:
2121
{{ tuple . "python3" | include "runScript" }}
2222
---
2323
image: alpine-python3
24-
from: python:3-alpine
24+
from: registry.werf.io/base/python:3-alpine
2525
git:
2626
{{ include "appGit" . }}
2727
ansible:

integration/suites/ansible/yarn/werf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ configVersion: 1
22
project: ansible-yarn
33
---
44
image: ~
5-
from: node:lts-alpine3.15
5+
from: registry.werf.io/base/node:lts-alpine3.15
66
git:
77
- add: /
88
to: /app

0 commit comments

Comments
 (0)