Skip to content

Commit

Permalink
Standardise files with files in sous-chefs/repo-management (#1299)
Browse files Browse the repository at this point in the history
Signed-off-by: kitchen-porter <[email protected]>
Co-authored-by: Dan Webb <[email protected]>
  • Loading branch information
kitchen-porter and damacus authored Feb 1, 2025
1 parent a761ae2 commit 935cf2d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 36 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Support digest image format in docker_container resource. If the tag starts with 'sha256:', the image reference is constructed using '@' separator instead of ':' (Issue #1057).
- Standardise files with files in sous-chefs/repo-management
- Support digest image format in docker_container resource. If the tag starts with 'sha256:', the image reference is constructed using '@' separator instead of ':' (Issue #1057)

## 11.9.0 - *2025-01-31*

Expand Down
12 changes: 0 additions & 12 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,6 @@ platforms:
image: dokken/oraclelinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: rhel-8
driver:
image: registry.access.redhat.com/ubi8/ubi-init
pid_one_command: /sbin/init

- name: rhel-9
driver:
image: registry.access.redhat.com/ubi9/ubi-init
pid_one_command: /sbin/init
intermediate_instructions:
- RUN dnf install -y libxcrypt-compat

- name: rockylinux-8
driver:
image: dokken/rockylinux-8
Expand Down
25 changes: 2 additions & 23 deletions kitchen.exec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,5 @@ driver: { name: exec }
transport: { name: exec }

platforms:
- name: ubuntu-latest

suites:
- name: swarm
provisioner:
enforce_idempotency: false
multiple_converge: 1
attributes:
docker:
version: '20.10.11'
swarm:
init:
advertise_addr: '127.0.0.1'
listen_addr: '0.0.0.0:2377'
rotate_token: true
service:
name: 'web'
image: 'nginx:latest'
publish: ['80:80']
replicas: 2
run_list:
- recipe[docker_test::swarm]
- recipe[docker_test::swarm_service]
- name: macos-latest
- name: windows-latest

0 comments on commit 935cf2d

Please sign in to comment.