File tree Expand file tree Collapse file tree 8 files changed +49
-56
lines changed Expand file tree Collapse file tree 8 files changed +49
-56
lines changed Original file line number Diff line number Diff line change @@ -5,12 +5,14 @@ ENV TERM=xterm
5
5
RUN yum install -y epel-release \
6
6
&& yum install -y \
7
7
ansible \
8
- git \
9
- iproute \
10
- java-1.8.0-openjdk \
11
- ruby \
12
- sudo \
13
- tar \
8
+ wget \
9
+ coreutils \
10
+ net-tools \
14
11
&& yum clean all
15
12
16
- RUN gem install serverspec
13
+ # # https://downloads.chef.io/inspec/1.24.0
14
+ RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/el/7/inspec-1.24.0-1.el7.x86_64.rpm \
15
+ && echo "c3b739f4262a56ad1626a4c46465a9905d3ab2d36514c4cfdc998cd2dae24f90 inspec-1.24.0-1.el7.x86_64.rpm" \
16
+ | sha256sum -c \
17
+ && yum install -y inspec-1.24.0-1.el7.x86_64.rpm \
18
+ && rm inspec-1.24.0-1.el7.x86_64.rpm
Original file line number Diff line number Diff line change 1
1
# vim: set ft=dockerfile:
2
2
3
- # Requires Ansible 1.8+ from jessie-backports.
4
- FROM debian:jessie-backports
3
+ FROM debian:jessie
5
4
6
5
# Colour output.
7
6
ENV TERM=xterm
8
7
9
- # Defaults to graphical.target.
10
- RUN systemctl set-default multi-user.target
11
-
12
- RUN apt-get update -y \
8
+ RUN echo deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main >> /etc/apt/sources.list \
9
+ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
10
+ && apt-get update -y \
13
11
&& apt-get --no-install-recommends install -y \
14
- default-jdk \
15
- gcc \
16
- git \
17
- libffi-dev \
18
- libssl-dev \
12
+ software-properties-common \
13
+ ansible \
14
+ wget \
15
+ coreutils \
19
16
net-tools \
20
- python-dev \
21
- python-pip \
22
- ruby \
23
- sudo \
24
- tar \
25
17
&& apt-get autoremove \
26
18
&& apt-get clean \
27
19
&& rm -rf /var/lib/apt/lists/*
28
20
29
- RUN pip install -U setuptools
30
-
31
- # A newish version of ansible is required, so install from pip instead of from
32
- # the old Debian package.
33
- RUN pip install ansible
34
-
35
- RUN gem install serverspec
21
+ # # https://downloads.chef.io/inspec/1.24.0
22
+ RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
23
+ && echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24
+ | sha256sum -c \
25
+ && dpkg -i inspec_1.24.0-1_amd64.deb \
26
+ && rm inspec_1.24.0-1_amd64.deb
Original file line number Diff line number Diff line change @@ -11,14 +11,16 @@ RUN apt-get update -y \
11
11
&& apt-get update -y \
12
12
&& apt-get --no-install-recommends install -y \
13
13
ansible \
14
- default-jdk \
15
- git \
14
+ wget \
15
+ coreutils \
16
16
net-tools \
17
- ruby2.0 \
18
- sudo \
19
- tar \
20
17
&& apt-get autoremove \
21
18
&& apt-get clean \
22
19
&& rm -rf /var/lib/apt/lists/*
23
20
24
- RUN gem2.0 install serverspec
21
+ # # https://downloads.chef.io/inspec/1.24.0
22
+ RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/14.04/inspec_1.24.0-1_amd64.deb \
23
+ && echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24
+ | sha256sum -c \
25
+ && dpkg -i inspec_1.24.0-1_amd64.deb \
26
+ && rm inspec_1.24.0-1_amd64.deb
Original file line number Diff line number Diff line change @@ -11,10 +11,16 @@ RUN apt-get update -y \
11
11
&& apt-get update -y \
12
12
&& apt-get --no-install-recommends install -y \
13
13
ansible \
14
+ wget \
15
+ coreutils \
14
16
net-tools \
15
- ruby2.3 \
16
17
&& apt-get autoremove \
17
18
&& apt-get clean \
18
19
&& rm -rf /var/lib/apt/lists/*
19
20
20
- RUN gem2.3 install serverspec
21
+ # # https://downloads.chef.io/inspec/1.24.0
22
+ RUN wget -q https://packages.chef.io/files/stable/inspec/1.24.0/ubuntu/16.04/inspec_1.24.0-1_amd64.deb \
23
+ && echo "33e8ab3dd4ed7eb2285310ae9d0a32e0cc45d5b6d057a29541f93870c2f9e30a inspec_1.24.0-1_amd64.deb" \
24
+ | sha256sum -c \
25
+ && dpkg -i inspec_1.24.0-1_amd64.deb \
26
+ && rm inspec_1.24.0-1_amd64.deb
Original file line number Diff line number Diff line change @@ -67,7 +67,8 @@ function main() {
67
67
sleep 30
68
68
69
69
# Run tests.
70
- docker exec -t " ${container} " rspec " ${WORKSPACE} /tests/spec/${SERVER} _spec.rb"
70
+ docker exec -t " ${container} " inspec exec " ${WORKSPACE} /tests/spec/${SERVER} _spec.rb"
71
+
71
72
}
72
73
73
74
[[ -z " ${CI:- } " ]] && trap debug ERR
Original file line number Diff line number Diff line change 1
- require_relative 'spec_helper'
2
-
3
1
describe user 'minecraft' do
4
2
it { should exist }
5
3
end
44
42
it { should be_installed }
45
43
end
46
44
47
- describe process 'java' do
48
- its ( :user ) { should eq 'minecraft' }
49
- its ( :args ) { should match /java -Xmx1024M -Xms1024M -jar minecraft_server\. jar nogui/ }
45
+ describe processes ( Regexp . new ( "java -Xmx1024M -Xms1024M -jar minecraft_server.jar nogui" ) ) do
46
+ its ( 'users' ) { should cmp 'minecraft' }
50
47
end
51
48
52
- describe port 25565 do
49
+ describe port ( 25565 ) do
53
50
it { should be_listening }
54
51
end
55
52
56
- describe port 25564 do
53
+ describe port ( 25564 ) do
57
54
it { should be_listening }
58
55
end
59
56
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- require_relative 'spec_helper'
2
-
3
1
describe user 'spigot' do
4
2
it { should exist }
5
3
end
44
42
it { should be_installed }
45
43
end
46
44
47
- describe process 'java' do
48
- its ( :user ) { should eq 'spigot' }
49
- its ( :args ) { should match /java -Xmx1024M -Xms1024M -jar spigot\. jar nogui/ }
45
+ describe processes ( Regexp . new ( "java -Xmx1024M -Xms1024M -jar spigot.jar nogui" ) ) do
46
+ its ( 'users' ) { should cmp 'spigot' }
50
47
end
51
48
52
- describe port 25565 do
49
+ describe port ( 25565 ) do
53
50
it { should be_listening }
54
51
end
55
52
56
- describe port 25564 do
53
+ describe port ( 25564 ) do
57
54
it { should be_listening }
58
55
end
59
56
You can’t perform that action at this time.
0 commit comments