From 9798329c6c8d021afb0fe56a51a5f69afcca40db Mon Sep 17 00:00:00 2001
From: Adrien le Maire <adrien@alemaire.be>
Date: Tue, 25 May 2021 07:57:53 +0000
Subject: [PATCH] Update matrix-webhook/Dockerfile, synapse/Makefile files

---
 matrix-webhook/Dockerfile | 18 +++++++++++-------
 synapse/Makefile          |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/matrix-webhook/Dockerfile b/matrix-webhook/Dockerfile
index 0b6a53e..32e4166 100644
--- a/matrix-webhook/Dockerfile
+++ b/matrix-webhook/Dockerfile
@@ -1,21 +1,25 @@
-FROM node:16.1.0
+FROM node:10-alpine
 
-COPY . /app
-WORKDIR /app
+COPY . /
+WORKDIR /
 ENV NODE_ENV=development
 
 RUN npm install -g npm-check-updates
 RUN ncu -u matrix-appservice-bridge
-RUN npm install \
-    && chmod +x docker-start.sh
-    
+RUN apk add --no-cache -t build-deps make gcc g++ python libc-dev wget git dos2unix \
+    && apk add --no-cache ca-certificates \
+    && dos2unix docker-start.sh \
+    && chmod +x docker-start.sh \
+    && npm install \
+    && apk del build-deps
+
 ENV NODE_ENV=production
 ENV WEBHOOKS_USER_STORE_PATH=/data/user-store.db
 ENV WEBHOOKS_ROOM_STORE_PATH=/data/room-store.db
 ENV WEBHOOKS_DB_CONFIG_PATH=/data/database.json
 ENV WEBHOOKS_ENV=docker
 
-CMD /app/docker-start.sh
+CMD /docker-start.sh
 
 EXPOSE 9000
 VOLUME ["/data"]
diff --git a/synapse/Makefile b/synapse/Makefile
index 9028a38..2d6a09e 100644
--- a/synapse/Makefile
+++ b/synapse/Makefile
@@ -1,5 +1,5 @@
 NAMESPACE=alemairebe
-VERSION=1.33.2
+VERSION=1.34.0
 IMAGE=synapse
 
 push: get decompress build