From b039da1ebad490fee85c9432f70521f0bee9942f Mon Sep 17 00:00:00 2001
From: Paul <36549980+Humorhenker@users.noreply.github.com>
Date: Thu, 14 Jan 2021 23:42:13 +0100
Subject: [PATCH 1/2] Add jpe as valid image filename extension (telegram)
 (#1360)

---
 bridge/telegram/handlers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index f1581a58..48cfd316 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -389,7 +389,7 @@ func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64) string {
 			Name:  fi.Name,
 			Bytes: *fi.Data,
 		}
-		re := regexp.MustCompile(".(jpg|png)$")
+		re := regexp.MustCompile(".(jpg|jpe|png)$")
 		if re.MatchString(fi.Name) {
 			c = tgbotapi.NewPhotoUpload(chatid, file)
 		} else {

From 207cd24edb25cd15b0f3a2705302d056fdacc77a Mon Sep 17 00:00:00 2001
From: Peter Dave Hello <hsu@peterdavehello.org>
Date: Fri, 15 Jan 2021 06:48:02 +0800
Subject: [PATCH 2/2] Unify/sync apk index cache control in Dockerfile (#1352)

The second stage is using a single `apk` command with `--no-cache` which is better.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ba83fde7..3b53c752 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine AS builder
 
 COPY . /go/src/github.com/42wim/matterbridge
-RUN apk update && apk add go git gcc musl-dev \
+RUN apk --no-cache add go git gcc musl-dev \
         && cd /go/src/github.com/42wim/matterbridge \
         && export GOPATH=/go \
         && go get \