Skip to content

Commit

Permalink
Use latest nmstate from copr (#227)
Browse files Browse the repository at this point in the history
Signed-off-by: Petr Horacek <[email protected]>
  • Loading branch information
phoracek authored Oct 23, 2019
1 parent 1dc703f commit 29bc841
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
FROM fedora:31

RUN sudo dnf install -y nmstate iproute iputils && \
RUN sudo dnf install -y dnf-plugins-core && \
sudo dnf copr enable -y nmstate/nmstate-git-fedora && \
sudo dnf install -y nmstate-0.0.8-0.20191022.669git5701bbe.fc31.noarch iproute iputils && \
sudo dnf remove -y dnf-plugins-core && \
sudo dnf clean all

# TODO: Delete this line after we update nmstate to include the change
# https://github.com/nmstate/nmstate/commit/a4baaff50fef84d6d326977ff647bece1e917a26
RUN sed -i "s/run(timeout=20/run(timeout=60/g" /usr/lib/python3.7/site-packages/libnmstate/netapplier.py
# TODO: Delete this line after nmstate fixes https://github.com/nmstate/nmstate/issues/516
RUN sed -i "s/nmclient.NM.DeviceType.OVS_INTERFACE,/nmclient.NM.DeviceType.OVS_INTERFACE, nmclient.NM.DeviceType.BRIDGE,/" /usr/lib/python3.7/site-packages/libnmstate/nm/applier.py

# Cannot change the binary to nmstate-handler since the name
# is taken from the directory name [1]
# [1] https://github.com/operator-framework/operator-sdk/blob/master/cmd/operator-sdk/build/cmd.go#L103
Expand Down

0 comments on commit 29bc841

Please sign in to comment.