From 60c6430b26c065130b5c53e77f992184ae93cdc7 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 2 May 2019 04:17:14 +0200
Subject: [PATCH] Remove favicon
---
pica-etherpad/Dockerfile | 1 -
pica-etherpad/entrypoint.sh | 3 ---
pica-etherpad/img/favicon.ico | Bin 4286 -> 0 bytes
3 files changed, 4 deletions(-)
delete mode 100644 pica-etherpad/img/favicon.ico
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index b032e607..8b456b2d 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -71,7 +71,6 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
FROM base
COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
-COPY img/favicon.ico /opt/etherpad-lite/src/favicon.ico
RUN apt-get update && \
apt-get install -y mysql-client abiword && \
chmod +x /opt/etherpad-lite/entrypoint.sh && \
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index 27bedba1..7faa9ae0 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -88,7 +88,6 @@ cat <<- EOF > /opt/etherpad-lite/settings.json
"skinName": "${ETHERPAD_THEME}",
"defaultPadText": "${ETHERPAD_DEFAULT_TEXT}",
"abiword": "/usr/bin/abiword",
- "favicon": "favicon.ico",
"padOptions": {
"lang": "fr",
"userName": "Anonyme",
@@ -116,6 +115,4 @@ cat <<- EOF >> /opt/etherpad-lite/settings.json
}
EOF
-cp /opt/etherpad-lite/favicon.ico /opt/etherpad-lite/src/static/favicon.ico
-
exec "$@"
diff --git a/pica-etherpad/img/favicon.ico b/pica-etherpad/img/favicon.ico
deleted file mode 100644
index acd0a0794367abfa5b7a7c1f6009d262866b96e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4286
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
--
GitLab