From 5167fd3b7026d21a5d3241e4090f03bcb525568e Mon Sep 17 00:00:00 2001 From: Shachar Snapiri Date: Mon, 17 Dec 2018 16:14:33 +0200 Subject: [PATCH] Add creation of /var/run/dragonflow directory in docker When running Dragonflow controller in container, an exception is thrown as the /var/run/dragonflow directory does not exist Change-Id: Ie2f83d5b34a1fd1fe6b6e0fe9975a24f1d6eeb6b Closes-Bug: #1808816 --- Dockerfile | 8 +++----- Dockerfile.fedora | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index c374cfb5b..4d3617897 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,9 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y $DRAGONFLOW_PACKAGES -RUN mkdir -p /opt/dragonflow +# Create config folder +ENV DRAGONFLOW_ETCDIR /etc/dragonflow +RUN mkdir -p $DRAGONFLOW_ETCDIR /opt/dragonflow /var/run/dragonflow # Copy Dragonflow sources to the container COPY . /opt/dragonflow/ @@ -19,9 +21,5 @@ COPY . /opt/dragonflow/ WORKDIR /opt/dragonflow RUN pip install -e . -# Create config folder -ENV DRAGONFLOW_ETCDIR /etc/dragonflow -RUN mkdir -p $DRAGONFLOW_ETCDIR - ENTRYPOINT ["./tools/run_dragonflow.sh"] diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 6966f8f55..bfa9a86c3 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -6,7 +6,9 @@ RUN dnf install -y git python3-pip python3-psutil python3-devel \ RUN alternatives --install /usr/bin/python python /usr/bin/python3 1 RUN alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 -RUN mkdir -p /opt/dragonflow +# Create config folder +ENV DRAGONFLOW_ETCDIR /etc/dragonflow +RUN mkdir -p $DRAGONFLOW_ETCDIR /opt/dragonflow /var/run/dragonflow # Copy Dragonflow sources to the container COPY . /opt/dragonflow/ @@ -15,9 +17,5 @@ COPY . /opt/dragonflow/ WORKDIR /opt/dragonflow RUN pip install -e . -# Create config folder -ENV DRAGONFLOW_ETCDIR /etc/dragonflow -RUN mkdir -p $DRAGONFLOW_ETCDIR - ENTRYPOINT ["./tools/run_dragonflow.sh"]