Skip to content

Commit 072bc0f

Browse files
committed
Switch to ubuntu base image and remove package tests
Switched base images as Debian have not released security patches for CVE-2021-44142
1 parent b6bd305 commit 072bc0f

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

samba-timemachine/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM debian:bullseye-20220125-slim
1+
FROM ubuntu:focal-20220113
22

3-
ENV SAMBA_VERSION="2:4.13.13+dfsg-1~deb11u2" \
4-
IPROUTE2_VERSION="5.10.0-4"
3+
ENV SAMBA_VERSION="2:4.13.17~dfsg-0ubuntu0.21.04.1" \
4+
IPROUTE2_VERSION="5.5.0-1ubuntu1"
55

66
ENV BACKUPDIR=/backups
77
VOLUME /backups
@@ -21,4 +21,4 @@ EXPOSE 445/tcp
2121
ADD entrypoint /entrypoint
2222
RUN chmod 0755 /entrypoint
2323

24-
ENTRYPOINT ["/entrypoint"]
24+
ENTRYPOINT ["/entrypoint"]

samba-timemachine/spec/samba-timemachine/samba-timemachine_spec.rb

-20
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
require 'spec_helper'
22

3-
# Define packages
4-
packages = {
5-
samba: {
6-
version: '2:4.13.13+dfsg-1~deb11u2'
7-
},
8-
'samba-vfs-modules': {
9-
version: '2:4.13.13+dfsg-1~deb11u2'
10-
}
11-
}
12-
133
def compose
144
@compose ||= Docker::Compose.new
155
end
@@ -32,16 +22,6 @@ def compose
3222
compose.rm(force: true)
3323
end
3424

35-
describe file('/etc/os-release') do
36-
its(:content) { is_expected.to match(%r{bullseye}) }
37-
end
38-
39-
packages.each do |name, details|
40-
describe package(name) do
41-
it { should be_installed.with_version(details[:version]) }
42-
end
43-
end
44-
4525
describe file('/entrypoint') do
4626
it { should exist }
4727
it { should be_file }

0 commit comments

Comments
 (0)