From 6bb06c0835f79c91a5f3656806bf47f0f7420d43 Mon Sep 17 00:00:00 2001
From: Vincent Sellier <vsellier@exoplatform.com>
Date: Sun, 20 Jan 2019 23:18:36 +0100
Subject: [PATCH] Upgrade to cozystack 1.1.0

---
 cozystack/Dockerfile | 25 ++++++++++++-------------
 cozystack/install.sh | 11 +++++------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/cozystack/Dockerfile b/cozystack/Dockerfile
index 633e3bd..4e9b685 100644
--- a/cozystack/Dockerfile
+++ b/cozystack/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stable-slim AS installer
 
-ARG COZY_VERSION=2018M4S3
+ARG COZY_VERSION=1.1.0
 ARG NODE_VERSION=8.11.3
 
 WORKDIR /tmp
@@ -19,19 +19,18 @@ RUN groupadd --gid 1000 cozy && useradd --gid 1000 --uid 1000 -m -d /usr/local/c
   && mkdir /etc/cozy && chown cozy:cozy /etc/cozy \
   && mkdir /usr/local/cozy-stack/scripts
 
-# Docker cloud still not support --chown option, even the edge version
-#COPY --chown=cozy:cozy --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
-#COPY --chown=cozy:cozy --from=installer /tmp/node /usr/local/node
-#COPY --chown=cozy:cozy entrypoint.sh /entrypoint.sh
-#COPY --chown=cozy:cozy cozy.yaml /etc/cozy/cozy.yaml
-#ADD --chown=cozy:cozy https://raw.githubusercontent.com/cozy/cozy-stack/2018M2S5/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
+COPY --chown=cozy:cozy --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
+COPY --chown=cozy:cozy --from=installer /tmp/node /usr/local/node
+COPY --chown=cozy:cozy entrypoint.sh /entrypoint.sh
+COPY --chown=cozy:cozy cozy.yaml /etc/cozy/cozy.yaml
+ADD --chown=cozy:cozy https://raw.githubusercontent.com/cozy/cozy-stack/2018M2S5/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
 ## Workaround
-COPY --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
-COPY --from=installer /tmp/node /usr/local/node
-COPY entrypoint.sh /entrypoint.sh
-COPY cozy.yaml /etc/cozy/cozy.yaml
-ADD https://raw.githubusercontent.com/cozy/cozy-stack/2018M2S5/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
-RUN chown cozy:cozy /usr/local/cozy-stack/cozy /usr/local/cozy-stack/scripts/konnector-node-run.sh /entrypoint.sh /etc/cozy/cozy.yaml
+#COPY --from=installer /tmp/cozy /usr/local/cozy-stack/cozy
+#COPY --from=installer /tmp/node /usr/local/node
+#COPY entrypoint.sh /entrypoint.sh
+#COPY cozy.yaml /etc/cozy/cozy.yaml
+#ADD https://raw.githubusercontent.com/cozy/cozy-stack/2018M2S5/scripts/konnector-node-run.sh /usr/local/cozy-stack/scripts/
+#RUN chown cozy:cozy /usr/local/cozy-stack/cozy /usr/local/cozy-stack/scripts/konnector-node-run.sh /entrypoint.sh /etc/cozy/cozy.yaml
 ## End of the Workaround
 
 RUN chmod u+x /entrypoint.sh /usr/local/cozy-stack/scripts/konnector-node-run.sh
diff --git a/cozystack/install.sh b/cozystack/install.sh
index eb448e1..19f708d 100755
--- a/cozystack/install.sh
+++ b/cozystack/install.sh
@@ -17,17 +17,16 @@ fi
 
 echo "Install cozy-stack..."
 
-wget -O /tmp/cozy https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH}
-wget -O /tmp/cozy.sha256 https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH}.sha256
+wget -O /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION} https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH}
+wget -O /tmp/cozy.sha256 https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack.sha256
 
-cat <<EOF >/tmp/SHA256
-SHA256(/tmp/cozy)= $(awk '{print $2}' cozy.sha256)
-EOF
+grep linux-${COZY_ARCH} /tmp/cozy.sha256 > /tmp/SHA256
 
 echo "Expected checkum                : $(cat /tmp/SHA256)"
-echo "Checksum of the downloaded file : $(sha256sum --tag /tmp/cozy)"
+echo "Checksum of the downloaded file : $(sha256sum --tag /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION})"
 sha256sum -c /tmp/SHA256
 
+mv /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION} /tmp/cozy
 chmod u+x /tmp/cozy
 
 echo "Install nodejs..."
-- 
GitLab