From 69aa2ab56e50c2c07dbbd79f0710788a272d1874 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 14 Jan 2021 09:23:53 +0100
Subject: Remove ec2-api image

Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>
Change-Id: I2c737971fc98873fc355d98e7bf1453ea13a8161
---
 docker/ec2-api/Dockerfile.j2   | 51 ------------------------------------------
 docker/ec2-api/extend_start.sh | 15 -------------
 2 files changed, 66 deletions(-)
 delete mode 100644 docker/ec2-api/Dockerfile.j2
 delete mode 100644 docker/ec2-api/extend_start.sh

(limited to 'docker/ec2-api')

diff --git a/docker/ec2-api/Dockerfile.j2 b/docker/ec2-api/Dockerfile.j2
deleted file mode 100644
index a6c9ee569..000000000
--- a/docker/ec2-api/Dockerfile.j2
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block ec2_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='ec2api') }}
-
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set ec2_api_packages = [
-            'openstack-ec2-api'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-
-{{ macros.install_packages(ec2_api_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-ADD ec2-api-archive /ec2-api-source
-
-{% set ec2_api_pip_packages = [
-    '/ec2-api'
-] %}
-
-RUN ln -s ec2-api-source/* ec2-api \
-    && {{ macros.install_pip(ec2_api_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/ec2api \
-    && cp -r /ec2-api/etc/ec2api/* /etc/ec2api \
-    && chown -R ec2api: /etc/ec2api
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block ec2_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER ec2api
diff --git a/docker/ec2-api/extend_start.sh b/docker/ec2-api/extend_start.sh
deleted file mode 100644
index 2ecd20b20..000000000
--- a/docker/ec2-api/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/ec2-api" ]]; then
-    mkdir -p /var/log/kolla/ec2-api
-fi
-if [[ $(stat -c %a /var/log/kolla/ec2-api) != "755" ]]; then
-    chmod 755 /var/log/kolla/ec2-api
-fi
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    ec2-api-manage db_sync
-    exit 0
-fi
-- 
cgit v1.2.3