Skip to content

dind: switch images to Fedora 27 #18737

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

Merged
merged 2 commits into from
Feb 26, 2018
Merged

dind: switch images to Fedora 27 #18737

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
9042406
dind: remove CentOS 7 Dockerfile
dcbw Feb 23, 2018
ac830de
dind: switch images to Fedora 27
dcbw Feb 23, 2018
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
15 changes: 6 additions & 9 deletions images/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# $ docker run -d --privileged openshift/dind
#

FROM fedora:25
FROM fedora:27

# Fix 'WARNING: terminal is not fully functional' when TERM=dumb
ENV TERM=xterm
Expand Down Expand Up @@ -49,19 +49,16 @@ RUN systemctl mask\
RUN cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/;\
sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service

# Remove non-english translations for glibc to reduce image size by 100mb.
# docker-v1.10-migrator is unnecessary for a new docker installation
# selinux-policy-minimum is unnecessary since selinux won't be enabled
# Remove non-english translations (by explicitly installing just the English
# ones) for glibc to reduce image size by 100mb. Also install various network
# utils for network debugging.
RUN dnf -y update && dnf -y install\
docker\
glibc-langpack-en\
iptables\
openssh-clients\
openssh-server

# Install network utils for debugging
# iproute2 tools are already installed.
RUN dnf -y install tcpdump
openssh-server\
tcpdump

## Configure docker

Expand Down
78 changes: 0 additions & 78 deletions images/dind/Dockerfile.centos7
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions images/dind/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN dnf -y update && dnf -y install\
iptables-services\
conntrack-tools\
openvswitch\
openvswitch-ovn-*\
python-netaddr\
python2-pyroute2\
python2-requests\
Expand All @@ -32,14 +33,6 @@ RUN dnf -y update && dnf -y install\
# Remove the CRI-O CNI network configs so openshift-sdn's will be used instead
RUN rm -f /etc/cni/net.d/*

# Upgrade to a newer OVS and install OVN packages that are only available
# with the newer release. (This can go away when the base image is upgraded to
# OVS 2.8 prerelease or release versions and include OVN sub-packages)
RUN dnf -y install dnf-plugins-core &&\
dnf -y copr enable danw/origin-dind-ovs &&\
dnf -y update openvswitch &&\
dnf -y install openvswitch-ovn-*

# A default deny firewall (either iptables or firewalld) is
# installed by default on non-cloud fedora and rhel, so all
# network plugins need to be able to work with one enabled.
Expand Down