From f8b7a29ee820539fa511e5191b310fe179371c33 Mon Sep 17 00:00:00 2001
From: bhambleton <brianthomashambleton@gmail.com>
Date: Tue, 26 Jul 2022 10:41:47 -0400
Subject: [PATCH 1/2] cleanup Dockerfile

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 51b514e..6bdce87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,11 @@ FROM ubuntu/apache2:latest
 #   && adduser --system --uid ${CISA_UID} --ingroup cisa cisa
 
 RUN apt-get clean && apt-get update && apt-get install -y apt-utils
-RUN apt-get install -y ssl-cert && \
+RUN apt-get install -y ssl-cert
 # TODO: test if this works on composition repo
-a2enmod rewrite proxy proxy_http headers cache && a2dismod -f deflate && \
-a2enmod ssl && a2ensite default-ssl.conf
+RUN a2enmod rewrite proxy proxy_http headers cache ssl
+RUN a2ensite default-ssl.conf
+RUN a2dismod -f deflate
 
 # ENTRYPOINT ["/bin/bash -c", "echo 'Apache up and running'"]
 

From 4bfac48c8c67dd02c3ee39aee2421954df231a6e Mon Sep 17 00:00:00 2001
From: bhambleton <brianthomashambleton@gmail.com>
Date: Tue, 9 Aug 2022 10:37:58 -0400
Subject: [PATCH 2/2] cleanup Dockerfile

---
 Dockerfile | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6bdce87..d57fe28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,28 +2,9 @@ ARG VERSION=unspecified
 
 FROM ubuntu/apache2:latest
 
-#ARG VERSION
-
-# For a list of pre-defined annotation keys and value types see:
-# https://github.com/opencontainers/image-spec/blob/master/annotations.md
-# Note: Additional labels are added by the build workflow.
-#LABEL org.opencontainers.image.authors="alexs.wijoyo@cisa.dhs.gov"
-#LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency"
-
-#ARG CISA_UID=421
-#ENV CISA_HOME="/home/cisa"
-
-# RUN addgroup --system --gid ${CISA_UID} cisa \
-#   && adduser --system --uid ${CISA_UID} --ingroup cisa cisa
 
 RUN apt-get clean && apt-get update && apt-get install -y apt-utils
 RUN apt-get install -y ssl-cert
-# TODO: test if this works on composition repo
 RUN a2enmod rewrite proxy proxy_http headers cache ssl
-RUN a2ensite default-ssl.conf
 RUN a2dismod -f deflate
-
-# ENTRYPOINT ["/bin/bash -c", "echo 'Apache up and running'"]
-
-# WORKDIR ${CISA_HOME}
-# USER cisa
+RUN a2ensite default-ssl.conf