Version 0.66.0-1

10 files changed, 101 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db6f08cc88bf..86a776acac8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rocketchat-server-docker
 	pkgdesc = An open source web chat platform, docker-compose package for minimal setup.
-	pkgver = 0.65.2
-	pkgrel = 2
+	pkgver = 0.66.0
+	pkgrel = 1
 	url = https://rocket.chat/
 	install = rocketchat-server.install
 	arch = any
@@ -9,16 +9,25 @@ pkgbase = rocketchat-server-docker
 	depends = docker
 	depends = docker-compose
 	conflicts = rocketchat-server
-	source = docker-compose.yml
-	source = example.env
+	noextract = rocketchat-server-0.66.0.tar.xz
+	backup = etc/rocketchat-server/config.env
+	backup = etc/rocketchat-server/docker.env
+	source = createEnvFile.sh
+	source = config.env
+	source = docker.env
+	source = https://github.com/Timmy1e/rocket.chat-docker/releases/download/0.66.0/rocketchat-server-0.66.0.tar.xz
 	source = rocketchat-server.env
 	source = rocketchat-server.install
+	source = rocketchat-server.yml
 	source = rocketchat.service
-	sha512sums = 8e40c069434f06769993939fe6c033892c2676f14feb58b98514ed330b41e14cd3851000e78276ac9b48ba25cf8dd069c96abeb636561fa066bec02a241708fe
-	sha512sums = 53f012f89511b7ce0d1b1c8c4e6ac0cc376dfae558619db1728257777abf3d9abd1ac22a7ecb73eaf1feabac3826950352d5ce7b7303e94d6d71c349976d6e29
-	sha512sums = 56146941271dbe8edd2e593392af665f4e39f7f78b48bf93aa21a3bef3886063eb2dd423b31ac1474c435500f7e34722f4eb5641665c643b6344360b2ad37c79
-	sha512sums = 92780bd28014a2cb93b30e392c1dd8a4d3a8fd7903f680c5715bfcbc3135e6d5d44b9ab7fb7b044d0fbdb042c4a7c5a36dade5a0a099db26737f62b94a5ddc03
-	sha512sums = 99200c457924a5c71acc8963cbce447e96836e2f4aa257ab614d1a37181c3ccaeea56dd80785cd7decf2081e66313a5aca50ecc1729f944e6593dbd6746eb650
+	sha512sums = 3c7ade4d47f6e8f94a7b2922bbc72d280ff68ed1672747b94f50df579d6071f2b2d6df80448ba4ba1f5bb9aa1517182807292168d4c097ccc5928b46c8eea1cb
+	sha512sums = db54d0809ff04e2adaba23c3e80dca95ff13660b342cde89c7bd0df42962f09af563b5405084f477fdc0d59ae4f176e453228a4eb3c1a7e86397579bded43f81
+	sha512sums = ffcd88ca7603f732b972bf94f973f94a240c5db0521f5e4b17fcfab7d6773e076ff91c5cbac821e9b99045936daab6f0224f8d8e50b0094d91e577785b19dc39
+	sha512sums = b4b29cea9191508457e98b9d3dae3283a9335b8eb6362d79c5ad2123684804582c38b1ed1b40c9cd4af042d00cf87423c216dbeb33c287d26936005d67ab31a4
+	sha512sums = 897d36d5b0d7a2b8e432db779977c97970b116ab4c3092dd8c6da9d03ecef653e9a1867a8e20618143afd164c3d2632805510962d098b442670210e1d07bb0ee
+	sha512sums = 5f93f8c593438c3c815e9197996120bc52c45d7b8db94591217925ed4b3a654df241e54363d256a4a94f04f4eee24c8c0069a592626a15487ce9bba6db0a0799
+	sha512sums = b7e4e516679c367669d45c93f106455e40e06c17c3766d4a43cb2d5c32ab8f83045c1c19d3041642a2bef5360f51b763fe4e291040515f2505d4c341d1502886
+	sha512sums = bde960c869333bc910e403ef34d58036174fe5af4a2dc4160102fe1d0a5b55f03836c2d214f6c2978affc26fed90cba17e579d247c37356e31622b8e5b20db28
 
 pkgname = rocketchat-server-docker
 
diff --git a/PKGBUILD b/PKGBUILD
index 1dcfcb0d7802..0179494be8c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=rocketchat-server-docker
 _pkgname=rocketchat-server
-pkgver=0.65.2
-pkgrel=2
+pkgver=0.66.0
+pkgrel=1
 pkgdesc="An open source web chat platform, docker-compose package for minimal setup."
 arch=("any")
 conflicts=("rocketchat-server")
@@ -13,28 +13,44 @@ depends=(
 	"docker"
 	"docker-compose"
 )
+backup=(
+	"etc/rocketchat-server/config.env"
+	"etc/rocketchat-server/docker.env"
+)
 source=(
-	"docker-compose.yml"
-	"example.env"
+	"createEnvFile.sh"
+	"config.env"
+	"docker.env"
+	"https://github.com/Timmy1e/rocket.chat-docker/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.xz"
 	"${_pkgname}.env"
 	"${_pkgname}.install"
+	"${_pkgname}.yml"
 	"rocketchat.service"
 )
+noextract=("${_pkgname}-${pkgver}.tar.xz")
 sha512sums=(
-	"8e40c069434f06769993939fe6c033892c2676f14feb58b98514ed330b41e14cd3851000e78276ac9b48ba25cf8dd069c96abeb636561fa066bec02a241708fe"
-	"53f012f89511b7ce0d1b1c8c4e6ac0cc376dfae558619db1728257777abf3d9abd1ac22a7ecb73eaf1feabac3826950352d5ce7b7303e94d6d71c349976d6e29"
-	"56146941271dbe8edd2e593392af665f4e39f7f78b48bf93aa21a3bef3886063eb2dd423b31ac1474c435500f7e34722f4eb5641665c643b6344360b2ad37c79"
-	"92780bd28014a2cb93b30e392c1dd8a4d3a8fd7903f680c5715bfcbc3135e6d5d44b9ab7fb7b044d0fbdb042c4a7c5a36dade5a0a099db26737f62b94a5ddc03"
-	"99200c457924a5c71acc8963cbce447e96836e2f4aa257ab614d1a37181c3ccaeea56dd80785cd7decf2081e66313a5aca50ecc1729f944e6593dbd6746eb650"
+	"3c7ade4d47f6e8f94a7b2922bbc72d280ff68ed1672747b94f50df579d6071f2b2d6df80448ba4ba1f5bb9aa1517182807292168d4c097ccc5928b46c8eea1cb"
+	"db54d0809ff04e2adaba23c3e80dca95ff13660b342cde89c7bd0df42962f09af563b5405084f477fdc0d59ae4f176e453228a4eb3c1a7e86397579bded43f81"
+	"ffcd88ca7603f732b972bf94f973f94a240c5db0521f5e4b17fcfab7d6773e076ff91c5cbac821e9b99045936daab6f0224f8d8e50b0094d91e577785b19dc39"
+	"b4b29cea9191508457e98b9d3dae3283a9335b8eb6362d79c5ad2123684804582c38b1ed1b40c9cd4af042d00cf87423c216dbeb33c287d26936005d67ab31a4"
+	"897d36d5b0d7a2b8e432db779977c97970b116ab4c3092dd8c6da9d03ecef653e9a1867a8e20618143afd164c3d2632805510962d098b442670210e1d07bb0ee"
+	"5f93f8c593438c3c815e9197996120bc52c45d7b8db94591217925ed4b3a654df241e54363d256a4a94f04f4eee24c8c0069a592626a15487ce9bba6db0a0799"
+	"b7e4e516679c367669d45c93f106455e40e06c17c3766d4a43cb2d5c32ab8f83045c1c19d3041642a2bef5360f51b763fe4e291040515f2505d4c341d1502886"
+	"bde960c869333bc910e403ef34d58036174fe5af4a2dc4160102fe1d0a5b55f03836c2d214f6c2978affc26fed90cba17e579d247c37356e31622b8e5b20db28"
 )
 install="${_pkgname}.install"
 package() {
 	mkdir -p ${pkgdir}/usr/share/${_pkgname}/data/
-	install -Dm644 docker-compose.yml ${pkgdir}/usr/share/${_pkgname}/docker-compose.yml
-	install -Dm644 ${_pkgname}.env ${pkgdir}/usr/share/${_pkgname}/${_pkgname}.env
+	install -Dm744 createEnvFile.sh ${pkgdir}/usr/share/${_pkgname}/createEnvFile.sh
+	install -Dm644 ${_pkgname}-${pkgver}.tar.xz ${pkgdir}/usr/share/${_pkgname}/${_pkgname}-${pkgver}.tar.xz
+	install -Dm644 ${_pkgname}.env ${pkgdir}/usr/share/${_pkgname}/config.env
+	install -Dm644 ${_pkgname}.yml ${pkgdir}/usr/share/${_pkgname}/${_pkgname}.yml
 	install -Dm644 rocketchat.service ${pkgdir}/usr/lib/systemd/system/rocketchat.service
-	install -Dm644 example.env ${pkgdir}/etc/${_pkgname}/example.env
+	install -Dm644 config.env ${pkgdir}/etc/${_pkgname}/config.example.env
+	install -Dm644 docker.env ${pkgdir}/etc/${_pkgname}/docker.example.env
+	install -Dm644 config.env ${pkgdir}/etc/${_pkgname}/config.env
+	install -Dm644 docker.env ${pkgdir}/etc/${_pkgname}/docker.env
 
-	echo "x_TAG=${pkgver}" > ${pkgdir}/usr/share/${_pkgname}.env
+	echo "x_TAG=${pkgver}" > ${pkgdir}/usr/share/${_pkgname}/docker.env
 }
 
diff --git a/config.env b/config.env
new file mode 100644
index 000000000000..731d8572c4e7
--- /dev/null
+++ b/config.env
@@ -0,0 +1,7 @@
+# This file contains the variables for the application it self.
+
+# The root URL the server will be accessible from such as "https://rocket.example.com".
+ROOT_URL=https://YOUR-DOMAIN.TLD
+# If you are accessing it directly set this to `False`, if you are using a proxy such as mapping it to a subdomain, use `True`.
+Accounts_UseDNSDomainCheck=True
+
diff --git a/createEnvFile.sh b/createEnvFile.sh
new file mode 100644
index 000000000000..13e24d8900b6
--- /dev/null
+++ b/createEnvFile.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+printf "# MERGED ON RUNTIME\! #\n#/usr/share/rocketchat-server/docker.env:\n" > .env
+cat /usr/share/rocketchat-server/docker.env >> .env
+printf "\n#/etc/rocketchat-server/docker.env:\n" >> .env
+cat /etc/rocketchat-server/docker.env >> .env
+
diff --git a/docker.env b/docker.env
new file mode 100644
index 000000000000..3effa538cfa5
--- /dev/null
+++ b/docker.env
@@ -0,0 +1,5 @@
+# This contains variables for the docker wrapper.
+
+# External port the application runs on.
+x_PORT=22020
+
diff --git a/example.env b/example.env
deleted file mode 100644
index 99a51d2e9867..000000000000
--- a/example.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# The root URL the server will be accessible from such as "https://rocket.example.com".
-ROOT_URL=https://YOUR-DOMAIN.TLD
-
diff --git a/rocketchat-server.env b/rocketchat-server.env
index 974ff97cd5d3..fdd8e5f2acd5 100644
--- a/rocketchat-server.env
+++ b/rocketchat-server.env
@@ -1,7 +1,5 @@
-# Variable to simplify package buidling.
-#ROCKETCHAT_SERVER_DOCKER_TAG=0.65.2
+# Variables for the application, these are the defaults it's set up with.
+
 # The MongoDB url, "mongodb://db:27017/rocketchat" is for docker version.
 MONGO_URL=mongodb://db:27017/rocketchat
-# Because we are using a proxy.
-Accounts_UseDNSDomainCheck=True
 
diff --git a/rocketchat-server.install b/rocketchat-server.install
index 813ca1ef929c..fbc48f50db60 100644
--- a/rocketchat-server.install
+++ b/rocketchat-server.install
@@ -1,8 +1,30 @@
 #!/usr/bin/env sh
 
 post_install() {
-	# If config doesn't exist, copy the example over it.
-	cp /etc/rocketchat-server/example.env /etc/rocketchat-server/config.env
-	echo "Server will use port 22020."
+	version_new=$(echo "$1" | /usr/bin/cut -d- -f1)
+
+	printf "\e[1m\e[32m==>\e[39m Loading the image into Docker...\e[0m\n"
+	/usr/bin/docker load -i "/usr/share/rocketchat-server/rocketchat-server-${version_new}.tar.xz"
+}
+
+pre_upgrade() {
+	version_old=$(echo "$2" | /usr/bin/cut -d- -f1)
+
+	printf "\e[1m\e[32m==>\e[39m Removing the old image from Docker...\e[0m\n"
+	/usr/bin/docker image rm "rocket.chat:${version_old}"
+}
+
+post_upgrade() {
+	version_new=$(echo "$1" | /usr/bin/cut -d- -f1)
+
+	printf "\e[1m\e[32m==>\e[39m Loading the new image into Docker...\e[0m\n"
+	/usr/bin/docker load -i "/usr/share/rocketchat-server/rocketchat-server-${version_new}.tar.xz"
+}
+
+post_remove() {
+	version_old=$(echo "$1" | /usr/bin/cut -d- -f1)
+
+	printf "\e[1m\e[32m==>\e[39m Removing the image from Docker...\e[0m\n"
+	/usr/bin/docker image rm "rocket.chat:${version_old}"
 }
 
diff --git a/docker-compose.yml b/rocketchat-server.yml
index a2b6d2cd0ca0..2800c35d2967 100644
--- a/docker-compose.yml
+++ b/rocketchat-server.yml
@@ -7,14 +7,14 @@ services:
       - "./data/dump:/dump"
     command: ["mongod", "--smallfiles"]
   rocketchat:
-    image: "rocketchat/rocket.chat:${x_TAG}"
+    image: "rocket.chat:${x_TAG}"
     env_file:
-      - "./rocketchat-server.env"
+      - "./config.env"
       - "/etc/rocketchat-server/config.env"
     depends_on:
       - "db"
     links:
       - "db:db"
     ports:
-      - "22020:3000"
+      - "${x_PORT}:3000"
 
diff --git a/rocketchat.service b/rocketchat.service
index 4d771213a6fa..8431bde29354 100644
--- a/rocketchat.service
+++ b/rocketchat.service
@@ -1,15 +1,16 @@
 [Unit]
 Description=Rocket.chat docker-compose service
-Wants=network-online.target
-After=network-online.target
 Requires=docker.service
+After=docker.service
 
 [Service]
 Restart=always
 WorkingDirectory=/usr/share/rocketchat-server/
-ExecStart=/usr/bin/docker-compose up
-ExecStop=/usr/bin/docker-compose down
+PreStart=printf "# BUILD ON RUNTIME\!\n#/usr/share/rocketchat-server/docker.env:\n" > .env
+PreStart=/usr/bin/sh createEnvFile.sh
+ExecStart=/usr/bin/docker-compose up -f rocketchat-server.yml
+ExecStop=/usr/bin/docker-compose down -v
 
 [Install]
-WantedBy=local.target
+WantedBy=multi-user.target