Replace CentOS7 sample app image with official PHP image

Dockerfile

@@ -1,6 +1,6 @@
 FROM i2incommon/shibboleth_sp:3.4.1_05152024_rocky9_multiarch
 
-LABEL version="0.0.2"
+LABEL version="${VERSION}"
 
 RUN dnf update -y && \
   dnf clean all

Makefile

@@ -0,0 +1,38 @@
+# This is the main interface into the repository for building the image of the Shibboleth SP reverse proxy.
+#
+# All targets assume they're running on a Linux or macOS host with Bash and Docker installed.
+# Any other dependencies should be satisfied by containers.
+#
+
+.DEFAULT_GOAL := help
+
+DEBUG = [DEBUG]
+INFO = [INFO]
+SUCCESS = [INFO]
+
+VERSION := $(shell cat VERSION.txt)
+
+compose := docker compose
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build: ## Build the Docker image
+	VERSION=latest $(compose) build proxy
+	@echo "$(SUCCESS) Successfully built!"
+
+.PHONY: clean
+clean: ## Remove build artifacts
+	@echo "This is where we clean everything!"
+
+.PHONY: help
+help: ## Display this help (default)
+	@echo "Targets:"
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort \
+	| awk 'BEGIN {FS = ":.*?## "}; {printf "  %-17s%s\n", $$1, $$2}'
+
+.PHONY: release
+release: ## Build the Docker image
+	VERSION=${VERSION} $(compose) build proxy
+	@echo "$(SUCCESS) Successfully built!"

VERSION.txt

@@ -0,0 +1 @@
+0.0.2

tests/docker-compose.yml → docker-compose.yml

@@ -10,19 +10,19 @@ services:
 
   app:
     build:
-      context: "./containers/app"
+      context: "./tests/containers/app"
     networks:
       - app-proxy
 
   data:
     build:
-      context: "./containers/ldap"
+      context: "./tests/containers/ldap"
     networks:
       - data-idp
 
   idp:
     build: 
-      context: "./containers/idp"
+      context: "./tests/containers/idp"
     depends_on:
       - data
     networks:
@@ -38,8 +38,8 @@ services:
 
   proxy:
     build:
-      context: ".."
-    image: shib-proxy:${PROXY_IMAGE_TAG}
+      context: "."
+    image: shib-proxy
     ports:
       - "8443:8443"
     environment:
@@ -281,7 +281,7 @@ services:
 
   test:
     build:
-      context: "./containers/test"
+      context: "./tests/containers/test"
     networks:
       - idp-test
       - proxy-test

tests/containers/app/Dockerfile

@@ -1,17 +1,4 @@
-# Application Container
-FROM centos:7
-
-# Update repo files since change from CentOS Base to CentOS Vault on 7/1/24
-RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
-  sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
-  sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-
-RUN yum -y update && \
-  yum install -y httpd php && \
-  yum clean all
-
-COPY container_files/httpd.conf /etc/httpd/conf/httpd.conf
-COPY container_files/app.conf /etc/httpd/conf.d/app.conf
-COPY container_files/html/ /var/www/html/
-
-CMD ["httpd", "-D", "FOREGROUND"]
+FROM php:8
+COPY container_files/html/ /usr/src/test-app
+WORKDIR /usr/src/test-app
+CMD [ "php", "-S", "0.0.0.0:80" ]

tests/containers/app/container_files/html/index.php

@@ -1 +1,15 @@
-<?php phpinfo(); ?>
+<?php
+
+header('Content-type: application/json');
+
+$headers = apache_request_headers();
+
+$data = array(
+    "headers" => $headers,
+);
+
+$json = json_encode($data);
+
+echo $json;
+
+?>