openstack
/
dragonflow
Code Issues Proposed changes

Merge "Add creation of /var/run/dragonflow directory in docker"

This commit is contained in:
Zuul 2018-12-19 13:40:56 +00:00 committed by Gerrit Code Review
parent 7c4a297080 5167fd3b70
commit a9779b9a94
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -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"]

8
Dockerfile.fedora
View File

@ -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"]