Skip to content

Commit 8401b2f

Browse files
committed
fix(suse): fix support to install compose from PackageHub on SLES 15
To actually install the packages, you need to set the following in your pillar because the PackageHub repos are not enabled by default on SLES. ```YAML docker: pkg: docker: use_upstream: 'package' compose: use_upstream: 'package' ```
1 parent 16cc758 commit 8401b2f

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

docker/codenamemap.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,15 @@ precise:
2222
deps:
2323
- linux-image-generic-lts-raring
2424
- linux-headers-generic-lts-raring
25+
26+
SUSE Linux Enterprise Server 15:
27+
pkg:
28+
compose:
29+
commands:
30+
- docker-compose
31+
32+
SUSE Linux Enterprise Server 15 SP1:
33+
pkg:
34+
compose:
35+
commands:
36+
- docker-compose

docker/osfamilymap.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ Suse:
7373
- gzip
7474
docker:
7575
name: docker
76+
compose:
77+
# https://packagehub.suse.com/packages/python-docker-compose/
78+
commands:
79+
- python-docker-compose
7680

7781
MacOS:
7882
identity:

test/integration/archive/controls/archive_spec.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
impact 1.0
77
title 'should be installed'
88

9+
case platform[:family]
10+
when 'suse'
11+
compose_bin = '/usr/local/bin/python-docker-compose'
12+
else
13+
compose_bin = '/usr/local/bin/docker-compose'
14+
end
15+
916
describe file('/usr/local/docker-19.03.9/bin') do
1017
it { should exist }
1118
it { should be_directory }
@@ -86,7 +93,7 @@
8693
its('mode') { should cmp '0755' }
8794
its('type') { should eq :file }
8895
end
89-
describe file('/usr/local/bin/docker-compose') do
96+
describe file("#{compose_bin}") do
9097
it { should be_symlink }
9198
it { should be_file }
9299
it { should_not be_directory }

0 commit comments

Comments
 (0)