Skip to content

Commit

Permalink
Merge branch 'main' into github-actions
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Webb <dan.webb@damacus.io>
  • Loading branch information
damacus authored Nov 13, 2023
2 parents 1cbdab3 + 65b4743 commit 87fdcbb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Kitchen-Docker Changelog

Future CHANGELOG notes will be in GitHub release notes

## 2.14.0 - November 13, 2023

- Make sure the /etc/sudoers.d directory exists by @garethgreenaway in [#397](https://github.com/test-kitchen/kitchen-docker/pull/397)
Expand Down
3 changes: 1 addition & 2 deletions lib/kitchen/docker/docker_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

module Kitchen
module Docker
# Version string for Docker Kitchen driver
DOCKER_VERSION = "2.14.0".freeze
DOCKER_VERSION = "2.15.0".freeze
end
end
2 changes: 1 addition & 1 deletion lib/kitchen/docker/helpers/dockerfile_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def gentoo_paludis_platform
def opensuse_platform
<<-CODE
ENV container docker
RUN zypper install -y sudo openssh which curl
RUN zypper install -y sudo openssh which curl gawk
RUN /usr/sbin/sshd-gen-keys-start
CODE
end
Expand Down

0 comments on commit 87fdcbb

Please sign in to comment.