diff --git a/.docker-compose/Dockerfile b/.docker-compose/Dockerfile index 04773a8..ab1a60b 100644 --- a/.docker-compose/Dockerfile +++ b/.docker-compose/Dockerfile @@ -9,5 +9,12 @@ RUN cd Cbc-2.9.8 && \ ./configure && \ make && \ make install +RUN python -m pip install -U Flask -CMD tail -f /dev/null +# Bundle app source +COPY . /app + +WORKDIR /app/app + +# CMD tail -f /dev/null +CMD export FLASK_APP=main && flask run -p 80 --host=0.0.0.0 diff --git a/.vagrantrc b/.vagrantrc index 5e70c72..ddc7b4d 100644 --- a/.vagrantrc +++ b/.vagrantrc @@ -39,10 +39,8 @@ measure-solver-logs() { compose "logs measure-solver" } -measure-solver-server() { -} - restart-measure-solver() { + compose "restart measure-solver" } rails() { diff --git a/Dockerfile b/Dockerfile index 04773a8..ab1a60b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,12 @@ RUN cd Cbc-2.9.8 && \ ./configure && \ make && \ make install +RUN python -m pip install -U Flask -CMD tail -f /dev/null +# Bundle app source +COPY . /app + +WORKDIR /app/app + +# CMD tail -f /dev/null +CMD export FLASK_APP=main && flask run -p 80 --host=0.0.0.0 diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e69de29..b25559e 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -0,0 +1,2 @@ +override_file_placeholder: + image: busybox