Merge pull request #21 from stfc/add_image_create_notes

DOC: Add extra notes for uploading the image to readme

amphora-image-builder/Dockerfile

@@ -1,9 +1,10 @@
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    python3-pip python3-virtualenv git sudo \
-    qemu-utils git kpartx debootstrap curl
+    python3-pip python3-virtualenv python3-pkg-resources git sudo \
+    qemu-utils git kpartx debootstrap curl && \
+    apt-get clean all
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

amphora-image-builder/README

@@ -15,5 +15,10 @@ Usage
 -----
 
 ```
-$ ./build.sh
+./build.sh
+
+# Set as appropriate to your environment
+export TARGET_PROJECT=service
+
+openstack image create --property hw_disk_bus=virtio --property hw_scsi_model=virtio-scsi --property hw_vif_multiqueue_enabled=true --private --project $TARGET_PROJECT --disk-format raw --container-format bare --file amphora-x64-haproxy.raw --progress amphora-x64-$(date +%Y-%m-%d)-haproxy
 ```

amphora-image-builder/entrypoint.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 
-set -e
+set -euxo pipefail
 
+cd /tmp
 python3 -m virtualenv octavia_disk_image_create
 # shellcheck source=/dev/null
 source octavia_disk_image_create/bin/activate
 
 git clone --depth=1 https://github.com/openstack/octavia
+DIB_REPO_PATH="$(pwd)/octavia"
+export DIB_REPO_PATH
+
 cd octavia/diskimage-create
 pip3 install -r requirements.txt
-
 ./diskimage-create.sh -t raw -o "/output/amphora-x64-$(date +"%Y-%m-%d")-haproxy.raw"