From 3e2bbae96bc36daa989eeaa9968d578989b5989b Mon Sep 17 00:00:00 2001
From: fredbcode <fred@numsys.eu>
Date: Fri, 23 Apr 2021 12:17:42 +0200
Subject: [PATCH] Fix Dockerfile

---
 Dockerfile                    |  2 +-
 gitlabci/docker-ci/Dockerfile | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 gitlabci/docker-ci/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 248af8c..cdd7ae7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:buster
 
 ENV SQUID_CACHE_DIR=/var/spool/squid \
     SQUID_LOG_DIR=/var/log/squid \
-    SQUID_USER=proxy \
+    SQUID_USER=proxy 
 
 WORKDIR /tmp
 
diff --git a/gitlabci/docker-ci/Dockerfile b/gitlabci/docker-ci/Dockerfile
deleted file mode 100644
index e1a53e3..0000000
--- a/gitlabci/docker-ci/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM debian:buster 
-
-LABEL commit.e2guardian=$COMMIT build_date.e2guardian=$BUILD_DATE
-COPY . /tmp/e2guardian
-RUN cd /tmp/e2guardian \
-    && apt-get update && apt-get install --no-install-recommends --no-install-suggests -y sed libevent-pthreads-* libssl1.1 ca-certificates \
-    && adduser --no-create-home --uid 1161 --group --system e2guardian \
-    && cp src/e2guardian /usr/sbin/e2guardian \
-    && chmod +x /usr/sbin/e2guardian \     
-    && cp -Rf configs /etc/e2guardian \
-    && mkdir -p /usr/share/e2guardian/languages \
-    && mkdir -p /run/e2guardian \
-    && mkdir -p /var/log/e2guardian && chown -R e2guardian /var/log/e2guardian && chown -R e2guardian /etc/e2guardian && chown -R e2guardian /run/e2guardian \
-    && cp -Rf data/languages /usr/share/e2guardian/ \
-    && cp data/*.gif /usr/share/e2guardian/ \
-    && cp data/*swf /usr/share/e2guardian/ \
-    && sed -i "s/^#dockermode.*$/dockermode\ =\ on/" /etc/e2guardian/e2guardian.conf \
-    && sed -i "s/^#pidfilename.*$/pidfilename\ =\ \/run\/e2guardian\/e2.pid/" /etc/e2guardian/e2guardian.conf \
-    && sed -i "s/^#icapport.*$/icapport\ =\ 1344/" /etc/e2guardian/e2guardian.conf \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* 
-
-HEALTHCHECK CMD curl localhost:8080 || exit 1
-USER e2guardian
-EXPOSE 8080
-CMD ["e2guardian", "-N"]