Skip to content

Commit 47e0526

Browse files
committed
Updated to fedora 24 and calibre 2.60.0
1 parent 9e60bac commit 47e0526

File tree

3 files changed

+5
-32
lines changed

3 files changed

+5
-32
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM fedora:23
1+
FROM fedora:24
22
MAINTAINER bradley leonard <[email protected]>
33

44
# install net-tools, required for serverspec to check ports
55
# install calibre
6-
RUN dnf clean all && dnf -y install net-tools procps-ng calibre-2.60.0
6+
RUN dnf clean all && dnf -y install procps-ng calibre-2.60.0
77

88
# create directories
99
RUN mkdir /data && mkdir /scripts

Dockerfile.orig

-23
This file was deleted.

spec/Dockerfile_spec.rb

+3-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
end
1717

18-
describe package('net-tools') do
19-
it { should be_installed }
18+
it "installs the right version of fedora" do
19+
expect(os_version).to include("Fedora release 24")
2020
end
2121

2222
describe 'Dockerfile#config' do
@@ -25,10 +25,6 @@
2525
end
2626
end
2727

28-
it "installs the right version of fedora" do
29-
expect(os_version).to include("Fedora release 23")
30-
end
31-
3228
describe package("calibre") do
3329
it { should be_installed.with_version('2.60.0') }
3430
end
@@ -63,7 +59,7 @@
6359
}
6460
)
6561

66-
@container.start('Binds' => ['/tmp/data:/data'])
62+
@container.start('Binds' => ['/home/bradley/calibre/data:/data:Z'])
6763
end
6864

6965
describe file('/data/library') do

0 commit comments

Comments
 (0)