From a8ade0f873992227beeb9b2ef1479bdad1a187d4 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 13 Mar 2017 18:44:20 +1000 Subject: [PATCH] Add building and running openstack image to Makefile Signed-off-by: Sven Dowideit --- Makefile | 10 ++++++++++ scripts/images/openstack/Dockerfile.dapper | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 Makefile mode change 100644 => 100755 scripts/images/openstack/Dockerfile.dapper diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 11f94d4e..36ef6f24 --- a/Makefile +++ b/Makefile @@ -37,6 +37,16 @@ clean: itest: ./.dapper integration-test 2>&1 | tee dist/itest.log +openstack: + cp dist/artifacts/rancheros.iso scripts/images/openstack/ + cd scripts/images/openstack && ../../../.dapper + +openstack-run: + qemu-system-x86_64 -curses \ + -net nic -net user \ + -m 2048M \ + --hdc scripts/images/openstack/dist/rancheros-openstack.img + help: @./scripts/help diff --git a/scripts/images/openstack/Dockerfile.dapper b/scripts/images/openstack/Dockerfile.dapper old mode 100644 new mode 100755 index 10d85a24..63a20562 --- a/scripts/images/openstack/Dockerfile.dapper +++ b/scripts/images/openstack/Dockerfile.dapper @@ -6,7 +6,8 @@ RUN mkdir -p /source/assets # Change here to build a specific version ENV VERSION latest -RUN curl -fL https://releases.rancher.com/os/${VERSION}/rancheros.iso > /source/assets/rancheros.iso +#RUN curl -fL https://releases.rancher.com/os/${VERSION}/rancheros.iso > /source/assets/rancheros.iso +COPY rancheros.iso /source/assets/rancheros.iso CMD ["/source/scripts/build.sh"] ENV DAPPER_RUN_ARGS --device /dev/kvm