From 46384f35b606aaec95dc37a837228e78bf2c4c56 Mon Sep 17 00:00:00 2001
From: Romain de Laage <romain.delaage@rdelaage.ovh>
Date: Wed, 28 Oct 2020 11:52:31 +0100
Subject: [PATCH] [CodiMD] Add supercronic to autoremove old pads each night
---
pica-codimd/Dockerfile | 15 +++++++++++----
pica-codimd/crontab | 1 +
pica-codimd/entrypoint.sh | 5 +++--
3 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 pica-codimd/crontab
diff --git a/pica-codimd/Dockerfile b/pica-codimd/Dockerfile
index fe3ce09c..75669481 100644
--- a/pica-codimd/Dockerfile
+++ b/pica-codimd/Dockerfile
@@ -1,12 +1,17 @@
ARG VERSION=2.2.0
ARG PORTCHECKER_VERSION=v1.0.6
+ARG SCVERSION=v0.1.11
FROM node:10.22.1-alpine3.11 as BUILD
ARG VERSION
+ARG SCVERSION
RUN apk add --no-cache --virtual .gyp libressl-dev git bash python make && \
-wget https://github.com/hackmdio/codimd/archive/${VERSION}.tar.gz && \
-tar xzf $VERSION.tar.gz -C /opt && \
-mv /opt/codimd-$VERSION /opt/codimd
+ wget https://github.com/hackmdio/codimd/archive/${VERSION}.tar.gz && \
+ tar xzf $VERSION.tar.gz -C /opt && \
+ mv /opt/codimd-$VERSION /opt/codimd && \
+ wget https://github.com/aptible/supercronic/releases/download/$SCVERSION/supercronic-linux-amd64 && \
+ chmod +x supercronic-linux-amd64 && \
+ mv supercronic-linux-amd64 /opt/codimd/supercronic
RUN cd /opt/codimd && npm install && \
npm run build && \
@@ -26,7 +31,7 @@ RUN addgroup --gid 5010 codimd && \
mkdir -p /home/codimd/app/deletedPads && \
chown -R codimd:codimd /home/codimd && \
# Git needed so NPM can clone packages and Python for node-gyp
- apk add --no-cache bash git python3-dev py3-pip gcc postgresql-dev musl-dev && \
+ apk add --no-cache bash git python3-dev py3-pip gcc postgresql-dev musl-dev make && \
pip3 install psycopg2 && \
wget https://github.com/hackmdio/portchecker/releases/download/${PORTCHECKER_VERSION}/portchecker-linux-amd64.tar.gz && \
tar xvf portchecker-linux-amd64.tar.gz -C /usr/local/bin && \
@@ -41,6 +46,8 @@ COPY --chown=5010:5010 --from=BUILD /opt/codimd .
COPY --chown=5010:5010 deleteOldPad.py .
+COPY crontab .
+
RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
COPY entrypoint.sh .
diff --git a/pica-codimd/crontab b/pica-codimd/crontab
new file mode 100644
index 00000000..3e7cbc58
--- /dev/null
+++ b/pica-codimd/crontab
@@ -0,0 +1 @@
+0 0 * * * /home/codimd/app/deleteOldPad.py
diff --git a/pica-codimd/entrypoint.sh b/pica-codimd/entrypoint.sh
index 37b9c2f8..b1bb4589 100755
--- a/pica-codimd/entrypoint.sh
+++ b/pica-codimd/entrypoint.sh
@@ -1,5 +1,6 @@
#! /bin/sh
sed "154a | <a href=\"https://picasoft.net/co/cgu.html\">CGU</a> " -i /home/codimd/app/public/views/index/body.ejs
-
-/home/codimd/app/docker-entrypoint.sh
+sed "41a Cette instance ne garde le contenu que deux ans après la dernière modification !" -i /home/codimd/app/public/views/index/body.ejs
+/home/codimd/app/docker-entrypoint.sh &
+/home/codimd/app/supercronic /home/codimd/app/crontab
--
GitLab