From 9fd6e3608ec1b79ec72199c63af77141cf7e0003 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 4 Jan 2023 11:50:59 +0100
Subject: Drop skydive

The project is not maintained anymore, last commit is 8th Jan 2022.

Change-Id: Iefbc3481925156dd267c696c8ab8b306637f5564
---
 docker/skydive/skydive-agent/Dockerfile.j2    | 27 ----------------------
 docker/skydive/skydive-analyzer/Dockerfile.j2 | 16 -------------
 docker/skydive/skydive-base/Dockerfile.j2     | 33 ---------------------------
 docker/skydive/skydive-base/extend_start.sh   |  8 -------
 4 files changed, 84 deletions(-)
 delete mode 100644 docker/skydive/skydive-agent/Dockerfile.j2
 delete mode 100644 docker/skydive/skydive-analyzer/Dockerfile.j2
 delete mode 100644 docker/skydive/skydive-base/Dockerfile.j2
 delete mode 100644 docker/skydive/skydive-base/extend_start.sh

(limited to 'docker')

diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2
deleted file mode 100644
index 72cf1b21f..000000000
--- a/docker/skydive/skydive-agent/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_agent_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block skydive_agent_install %}
-
-{% if base_package_type == 'rpm' %}
-
-    {% set skydive_agent_packages = ['openvswitch'] %}
-
-{% elif base_package_type == 'deb' %}
-
-    {% set skydive_agent_packages = ['openvswitch-common'] %}
-
-{% endif %}
-
-{{ macros.install_packages(skydive_agent_packages | customizable("packages")) }}
-
-{% endblock %}
-
-{% block skydive_agent_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2
deleted file mode 100644
index de265af51..000000000
--- a/docker/skydive/skydive-analyzer/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_analyzer_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block skydive_analyzer_install %}{% endblock %}
-
-{% block skydive_analyzer_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}
-
-USER skydive
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2
deleted file mode 100644
index 70490a3fa..000000000
--- a/docker/skydive/skydive-base/Dockerfile.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block skydive_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-{{ macros.configure_user(name='skydive') }}
-
-{% block skydive_version %}
-ARG skydive_version=0.28.0
-ARG skydive_url=https://github.com/skydive-project/skydive/releases/download/v${skydive_version}/skydive
-{% endblock %}
-
-{% block skydive_install %}
-
-{% if base_arch != 'x86_64' %}
-RUN echo 'image on {{ base_distro }} is not yet available on non x86_64 platforms' \
-    && /bin/false
-{% else %}
-RUN curl -o /usr/bin/skydive ${skydive_url} \
-    && chmod +x /usr/bin/skydive
-{% endif %}
-
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block skydive_base_footer %}{% endblock %}
diff --git a/docker/skydive/skydive-base/extend_start.sh b/docker/skydive/skydive-base/extend_start.sh
deleted file mode 100644
index 7d9bfb418..000000000
--- a/docker/skydive/skydive-base/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/skydive" ]]; then
-    mkdir -p /var/log/kolla/skydive
-fi
-if [[ $(stat -c %a /var/log/kolla/skydive) != "755" ]]; then
-    chmod 755 /var/log/kolla/skydive
-fi
-- 
cgit v1.2.3