aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-03-20 15:56:14 +0100
committerDr. Jens Harbott <frickler@offenerstapel.de>2025-03-21 09:37:17 +0000
commitf2fba3842cd520161f5c136297d806e9fe4d7521 (patch)
tree6808c42d0450a6846a4018d18d5558597b6d4f2d /docker/swift
parent830a10922565c9e482d799e7feca47ffe16624b0 (diff)
downloadkolla-f2fba3842cd520161f5c136297d806e9fe4d7521.tar.gz
kolla-f2fba3842cd520161f5c136297d806e9fe4d7521.zip
Remove swift container images
Change-Id: I05a96f27b47a0f87bcf435872dd08ec0927232e3
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-account/Dockerfile.j215
-rw-r--r--docker/swift/swift-base/Dockerfile.j248
-rw-r--r--docker/swift/swift-base/swift_sudoers2
-rw-r--r--docker/swift/swift-container/Dockerfile.j215
-rw-r--r--docker/swift/swift-object-expirer/Dockerfile.j215
-rw-r--r--docker/swift/swift-object/Dockerfile.j215
-rw-r--r--docker/swift/swift-proxy-server/Dockerfile.j221
-rw-r--r--docker/swift/swift-rsyncd/Dockerfile.j225
-rw-r--r--docker/swift/swift-rsyncd/extend_start.sh4
9 files changed, 0 insertions, 160 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
deleted file mode 100644
index 26a6b1aa8..000000000
--- a/docker/swift/swift-account/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_account_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_account_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
deleted file mode 100644
index a460d59d9..000000000
--- a/docker/swift/swift-base/Dockerfile.j2
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='swift') }}
-
-{% if base_package_type == 'rpm' %}
- {% set swift_base_packages = [
- 'liberasurecode-devel',
- 'nmap-ncat',
- 'rsync',
- ] %}
-{% elif base_package_type == 'deb' %}
- {% set swift_base_packages = [
- 'liberasurecode-dev',
- 'netcat-openbsd',
- 'rsync',
- ] %}
-{% endif %}
-
-{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
-
-ADD swift-base-archive /swift-base-source
-
-{% set swift_base_pip_packages = [
- '/swift'
-] %}
-
-COPY swift_sudoers /etc/sudoers.d/kolla_swift_sudoers
-
-RUN ln -s swift-base-source/* swift \
- && {{ macros.install_pip(swift_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \
- && cp -r /swift/etc/* /etc/swift/ \
- && cp /var/lib/kolla/venv/etc/pycadf/swift_api_audit_map.conf /etc/swift/ \
- && chown -R swift: /var/cache/swift /var/lock/swift \
- && chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/kolla_swift_sudoers \
- && mkdir -p /opt/swift
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_base_footer %}{% endblock %}
diff --git a/docker/swift/swift-base/swift_sudoers b/docker/swift/swift-base/swift_sudoers
deleted file mode 100644
index f60e2260b..000000000
--- a/docker/swift/swift-base/swift_sudoers
+++ /dev/null
@@ -1,2 +0,0 @@
-swift ALL=(root) NOPASSWD: /bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+
-swift ALL=(root) NOPASSWD: /usr/bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
deleted file mode 100644
index 74fba6c4e..000000000
--- a/docker/swift/swift-container/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_container_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_container_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
deleted file mode 100644
index 17a04f0fd..000000000
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_object_expirer_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_object_expirer_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
deleted file mode 100644
index 3abfd1989..000000000
--- a/docker/swift/swift-object/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_object_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_object_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
deleted file mode 100644
index 49f115c5d..000000000
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_proxy_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set swift_proxy_server_pip_packages = [
- 'ceilometermiddleware'
-] %}
-
-RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_packages")) }}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_proxy_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
deleted file mode 100644
index 66a2f8dba..000000000
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block swift_rsyncd_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set swift_rsyncd_packages = ['rsync'] %}
-{% elif base_package_type == 'deb' %}
- {% set swift_rsyncd_packages = ['rsync'] %}
-{% endif %}
-
-{{ macros.install_packages(swift_rsyncd_packages | customizable("packages")) }}
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block swift_rsyncd_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER swift
diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh
deleted file mode 100644
index 33ff2bf2c..000000000
--- a/docker/swift/swift-rsyncd/extend_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-sudo find /srv/node/ -maxdepth 1 -type d -execdir chown swift:swift {} \+
-mkdir -p /var/lib/swift/lock