Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(suse): Fix support to install compose from PackageHub on SLES 15 #296

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(suse): Fix support to install compose from PackageHub on SLES 15 #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4534591
fix(suse): fix support to install compose from packagehub on sles 15
ypid-geberit Aug 5, 2021
0734586
ci: workaround for #313
ypid-geberit Feb 6, 2022
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
12 changes: 12 additions & 0 deletions docker/codenamemap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,15 @@ precise:
deps:
- linux-image-generic-lts-raring
- linux-headers-generic-lts-raring

SUSE Linux Enterprise Server 15:
pkg:
compose:
commands:
- docker-compose

SUSE Linux Enterprise Server 15 SP1:
pkg:
compose:
commands:
- docker-compose
4 changes: 4 additions & 0 deletions docker/osfamilymap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ Suse:
- gzip
docker:
name: docker
compose:
# https://packagehub.suse.com/packages/python-docker-compose/
commands:
- python-docker-compose

MacOS:
identity:
Expand Down
9 changes: 8 additions & 1 deletion test/integration/archive/controls/archive_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
impact 1.0
title 'should be installed'

case os[:name]
when 'opensuse'
compose_bin = '/usr/local/bin/python-docker-compose'
else
compose_bin = '/usr/local/bin/docker-compose'
end

describe file('/usr/local/docker-19.03.9/bin') do
it { should exist }
it { should be_directory }
Expand Down Expand Up @@ -86,7 +93,7 @@
its('mode') { should cmp '0755' }
its('type') { should eq :file }
end
describe file('/usr/local/bin/docker-compose') do
describe file(compose_bin) do
it { should be_symlink }
it { should be_file }
it { should_not be_directory }
Expand Down
2 changes: 1 addition & 1 deletion test/integration/archive/inspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ supports:
- platform-name: centos
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
# - platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
Expand Down
2 changes: 1 addition & 1 deletion test/integration/clean/inspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ supports:
- platform-name: centos
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
# - platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
Expand Down
2 changes: 1 addition & 1 deletion test/integration/package/inspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ supports:
- platform-name: centos
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
# - platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
Expand Down
2 changes: 1 addition & 1 deletion test/integration/share/inspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ supports:
- platform-name: centos
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
# - platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
Expand Down