summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gorshunov <roman.gorshunov@att.com>2018-09-21 03:31:12 +0200
committerRoman Gorshunov <roman.gorshunov@att.com>2018-09-21 03:31:12 +0200
commitba432cffe6ad36893a414bf01135a6f0493d7950 (patch)
treebf3ec56aa0ff77c5541747b7f2aa345fe6725e1e
parenta1baeb367d5f3689de35a268a4b8abbae5a080bf (diff)
Fix: git commit id labels on images
1) Use OCI Image Specs for labels instead of custom 'commit-id=xxxxx' or legacy "Label Schema" 2) Fix missing git commit id labels on images (.revision) 3) Add human-readable title (.title) of the image, URL (.url), and a few other properties (annotations) according to the latest Specs Change-Id: I63c39512ad04f36f63ddb27f0cfd5ef34b7d3467
Notes
Notes (review): Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Code-Review+2: Pete Birley <petebirley@gmail.com> Workflow+1: Pete Birley <petebirley@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 21 Sep 2018 15:21:26 +0000 Reviewed-on: https://review.openstack.org/604244 Project: openstack/airship-berth Branch: refs/heads/master
-rw-r--r--Dockerfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 35b6874..9c91699 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,12 @@
1FROM ubuntu:16.04 1FROM ubuntu:16.04
2 2
3LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
4LABEL org.opencontainers.image.url='https://airshipit.org'
5LABEL org.opencontainers.image.documentation='https://airship-berth.readthedocs.org'
6LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-berth'
7LABEL org.opencontainers.image.vendor='The Airship Authors'
8LABEL org.opencontainers.image.licenses='Apache-2.0'
9
3RUN apt-get update && apt-get install -y qemu-kvm dnsmasq bridge-utils mkisofs curl jq wget iptables 10RUN apt-get update && apt-get install -y qemu-kvm dnsmasq bridge-utils mkisofs curl jq wget iptables
4RUN apt-get clean 11RUN apt-get clean
5RUN rm -f /var/lib/apt/lists/* || true 12RUN rm -f /var/lib/apt/lists/* || true