From 5cab8e51a3105f3d5b6e573ef627d3c8d9db7adf Mon Sep 17 00:00:00 2001
From: Mikael Arguedas <mikael.arguedas@gmail.com>
Date: Thu, 20 Feb 2020 23:35:06 +0100
Subject: [PATCH] add blueprint as well

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
---
 ignition/blueprint/ubuntu/bionic/Makefile     | 19 +++++++++++
 .../ubuntu/bionic/ignition/Dockerfile         | 32 +++++++++++++++++++
 .../blueprint/ubuntu/bionic/images.yaml.em    | 13 ++++++++
 .../blueprint/ubuntu/bionic/platform.yaml     | 13 ++++++++
 ignition/manifest.yaml                        | 15 ++++++++-
 5 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 ignition/blueprint/ubuntu/bionic/Makefile
 create mode 100644 ignition/blueprint/ubuntu/bionic/ignition/Dockerfile
 create mode 100644 ignition/blueprint/ubuntu/bionic/images.yaml.em
 create mode 100644 ignition/blueprint/ubuntu/bionic/platform.yaml

diff --git a/ignition/blueprint/ubuntu/bionic/Makefile b/ignition/blueprint/ubuntu/bionic/Makefile
new file mode 100644
index 000000000..affa983c4
--- /dev/null
+++ b/ignition/blueprint/ubuntu/bionic/Makefile
@@ -0,0 +1,19 @@
+all: help
+
+help:
+	@echo ""
+	@echo "-- Help Menu"
+	@echo ""
+	@echo "   1. make build            - build all images"
+	@echo "   2. make pull             - pull all images"
+	@echo "   3. make clean            - remove all images"
+	@echo ""
+
+build:
+	@docker build --tag=ignition:blueprint-bionic	ignition/.
+
+pull:
+	@docker pull ignition:blueprint-bionic
+
+clean:
+	@docker rmi -f ignition:blueprint-bionic
diff --git a/ignition/blueprint/ubuntu/bionic/ignition/Dockerfile b/ignition/blueprint/ubuntu/bionic/ignition/Dockerfile
new file mode 100644
index 000000000..0d3e19d9c
--- /dev/null
+++ b/ignition/blueprint/ubuntu/bionic/ignition/Dockerfile
@@ -0,0 +1,32 @@
+# This is an auto generated Dockerfile for ignition:ignition
+# generated from docker_images/create_ignition_image.Dockerfile.em
+FROM ubuntu:bionic
+
+# setup timezone
+RUN echo 'Etc/UTC' > /etc/timezone && \
+    ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
+    apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
+
+# install packages
+RUN apt-get update && apt-get install -q -y \
+    dirmngr \
+    gnupg2 \
+    lsb-release \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+
+# setup sources.list
+RUN . /etc/os-release \
+    && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
+
+# install ignition packages
+RUN apt-get update && apt-get install -q -y \
+    ignition-blueprint=1.0.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup environment
+EXPOSE 11345
+
+CMD ["ign", "gazebo", "-s"]
diff --git a/ignition/blueprint/ubuntu/bionic/images.yaml.em b/ignition/blueprint/ubuntu/bionic/images.yaml.em
new file mode 100644
index 000000000..7b71ae3ae
--- /dev/null
+++ b/ignition/blueprint/ubuntu/bionic/images.yaml.em
@@ -0,0 +1,13 @@
+%YAML 1.1
+# Ignition Dockerfile database
+---
+images:
+    ignition:
+        base_image: @(os_name):@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images/create_ignition_image.Dockerfile.em
+        # entrypoint_name: docker_images/no_entrypoint.sh
+        template_packages:
+            - docker_templates
+        ignition_packages:
+            - ignition-@(ignition_version)
diff --git a/ignition/blueprint/ubuntu/bionic/platform.yaml b/ignition/blueprint/ubuntu/bionic/platform.yaml
new file mode 100644
index 000000000..14adc305e
--- /dev/null
+++ b/ignition/blueprint/ubuntu/bionic/platform.yaml
@@ -0,0 +1,13 @@
+%YAML 1.1
+# Ignition Dockerfile database
+---
+platform:
+    os_name: ubuntu
+    os_code_name: bionic
+    ignition_version: blueprint
+    user_name: ignition
+    maintainer_name:
+    arch: amd64
+    type: distribution
+    version:
+    release: stable
diff --git a/ignition/manifest.yaml b/ignition/manifest.yaml
index e1f5c1ba9..69e388b10 100644
--- a/ignition/manifest.yaml
+++ b/ignition/manifest.yaml
@@ -14,8 +14,21 @@ defaults:
             platform: .config/platform.yaml.em
 
 release_names:
+    'blueprint':
+        eol: 2020-09-01
+        os_names:
+            ubuntu:
+                os_code_names:
+                    bionic:
+                        <<: *DEFAULT
+                        archs:
+                            - amd64
+                        tag_names:
+                            ignition:
+                                aliases:
+                                    - "$release_name-$os_code_name"
     'citadel':
-        eol: 2025-01-01
+        eol: 2024-12-01
         os_names:
             ubuntu:
                 os_code_names: