From eca07e47e492bb5286f5f90fc1161aa6b6479100 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Thu, 13 Jul 2017 21:04:51 -0500 Subject: [PATCH] Fix Dockerfile Fix build issues in Dockerfile and update dev environment instructions to use Docker instead of virtualenv --- Dockerfile | 4 +--- README.md | 10 +++++----- examples/bootdata/join.sh | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 examples/bootdata/join.sh diff --git a/Dockerfile b/Dockerfile index 341b3cea..c352d748 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,9 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM drydock_base:0.1 - -ARG VERSION +FROM ubuntu:16.04 ENV DEBIAN_FRONTEND noninteractive ENV container docker diff --git a/README.md b/README.md index 8e2f0347..f968056a 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ A python REST orchestrator to translate a YAML host topology to a provisioned se To run: - $ virtualenv -p python3 /var/tmp/drydock - $ . /var/tmp/drydock/bin/activate - $ python setup.py install - $ uwsgi --http :9000 -w drydock_provisioner.drydock --callable drydock --enable-threads -L + $ docker build . -t drydock + $ docker run -v /path/to/drydock/repo/examples:/etc/drydock -P --name='drydock' drydock + $ DDPORT=$(docker ps -f name=drydock | grep -oE '0.0.0.0:[0-9]+' | cut -d':' -f 2) + $ curl -v http://localhost:${DDPORT}/api/v1.0/designs ## Modular service @@ -56,4 +56,4 @@ Pluggable provisioner for server bootstrapping. Initial implementation is MaaS c aka introspection API for bootstrapping nodes to load self data. Possibly pluggable as this is basically an -authenticated bridge to the Design State API \ No newline at end of file +authenticated bridge to the Design State API diff --git a/examples/bootdata/join.sh b/examples/bootdata/join.sh new file mode 100644 index 00000000..2ecbe6c0 --- /dev/null +++ b/examples/bootdata/join.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo 'Test'