From 8695a0eaa5896521c88fd040b50e30cb4f78f4ab Mon Sep 17 00:00:00 2001
From: Adrien le Maire <adrien@alemaire.be>
Date: Tue, 4 May 2021 09:34:02 +0000
Subject: [PATCH] Update element/Makefile, element/Dockerfile, .gitlab-ci.yml
 files

---
 .gitlab-ci.yml     |  8 ++++----
 element/Dockerfile |  8 ++++++++
 element/Makefile   | 20 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 element/Dockerfile
 create mode 100644 element/Makefile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee8b1a7..ac529d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,16 +7,16 @@ variables:
   DOCKER_BUILDKIT: 1
 
 
-dev-minio:
+element:
   stage: build
   tags:
    - docker
   script:
-    - cd minio
-    - make nopush
+    - cd element
+    - make push
   only:
     variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
+      - $CI_COMMIT_REF_PROTECTED == "true"
     changes:
       - minio/*
 
diff --git a/element/Dockerfile b/element/Dockerfile
new file mode 100644
index 0000000..86b7db1
--- /dev/null
+++ b/element/Dockerfile
@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+COPY ./element /app
+
+# Insert wasm type into Nginx mime.types file so they load correctly.
+RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types \
+ && rm -rf /usr/share/nginx/html \
+ && ln -s /app /usr/share/nginx/html
\ No newline at end of file
diff --git a/element/Makefile b/element/Makefile
new file mode 100644
index 0000000..bf31cbc
--- /dev/null
+++ b/element/Makefile
@@ -0,0 +1,20 @@
+NAMESPACE=alemairebe
+IMAGE=element
+VERSION=v1.7.26
+
+push: get decompress build
+
+get:
+	wget https://github.com/vector-im/element-web/releases/download/${VERSION}/element-${VERSION}.tar.gz
+
+decompress:
+	tar -xf element-$(VERSION).tar.gz
+    mv element-$(VERSION) element
+    mv element/config.sample.json element/config.json
+
+build:
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
+      --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+	  --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+	  --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+	  --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .