From 610eef2089c186c6e698bb1781501ee8c696f7d5 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 24 Apr 2026 19:25:00 +0200
Subject: Drop apache installation outside of httpd container

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986483
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986352
Change-Id: Ia66dde09bbbad2a5a9e67a8c642f3223ca38be43
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
---
 .../letsencrypt-webserver/Dockerfile.j2            | 34 ----------------------
 .../letsencrypt-webserver/extend_start.sh          |  3 --
 2 files changed, 37 deletions(-)
 delete mode 100644 docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2
 delete mode 100644 docker/letsencrypt/letsencrypt-webserver/extend_start.sh

(limited to 'docker/letsencrypt')

diff --git a/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2
deleted file mode 100644
index d4be0153f..000000000
--- a/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}letsencrypt-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block letsencrypt_webserver_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set letsencrypt_webserver_packages = [
-        'httpd',
-        'mod_ssl'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set letsencrypt_webserver_packages = [
-        'apache2'
-    ] %}
-{% endif %}
-{{ macros.install_packages(letsencrypt_webserver_packages | customizable("packages")) }}
-
-{% if base_package_type == 'rpm' %}
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-{% elif base_package_type == 'deb' %}
-RUN echo > /etc/apache2/ports.conf
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_letsencrypt_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block letsencrypt_webserver_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/letsencrypt/letsencrypt-webserver/extend_start.sh b/docker/letsencrypt/letsencrypt-webserver/extend_start.sh
deleted file mode 100644
index c55f0b199..000000000
--- a/docker/letsencrypt/letsencrypt-webserver/extend_start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-. /usr/local/bin/kolla_httpd_setup
-- 
cgit v1.2.3