From 51f340f22c3d92357d3980087c8c3a3f9a9952b6 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <julien.cabillot@fxinnovation.com>
Date: Fri, 19 Mar 2021 10:00:26 -0400
Subject: [PATCH] maintenance: 1.7.0 with alpine

---
 Dockerfile        | 49 +++++++++++++++++++++--------------------------
 Dockerfile.ubuntu | 34 ++++++++++++++++++++++++++++++++
 README.md         |  3 +++
 entrypoint.sh     |  4 ++--
 4 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 Dockerfile.ubuntu
 create mode 100644 README.md

diff --git a/Dockerfile b/Dockerfile
index ec6cac4..b619432 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,29 @@
-ARG  UBUNTU_VERSION="20.10"
-FROM "ubuntu:${UBUNTU_VERSION}"
-ARG  UBUNTU_VERSION
+FROM alpine:3 AS builder
 
-#ARG OCTANT_VERSION="0.16.1"
+ENV OCTANT_VERSION=0.17.0
+ENV OCTANT_CHECKSUM=9f10ef7a0ae7f4dffa18da66d608c63c0116c6709eab1e0db75a17da3f165d98
 
-USER "root"
+RUN apk update && \
+    apk add \
+      ca-certificates \
+      xdg-utils \
+      && \
+    wget --quiet --output-document /tmp/octant.tar.gz \
+        https://github.com/vmware-tanzu/octant/releases/download/v${OCTANT_VERSION}/octant_${OCTANT_VERSION}_Linux-64bit.tar.gz && \
+    sha256sum /tmp/octant.tar.gz | grep "$OCTANT_CHECKSUM" && \
+    if [[ $? -ne 0 ]]; then echo "Bad checksum"; exit 444; fi && \
+    tar -xzvf /tmp/octant.tar.gz --strip 1 -C /opt
 
-COPY "entrypoint.sh" "/entrypoint.sh"
+COPY entrypoint.sh /
 
-RUN export DEBIAN_FRONTEND="noninteractive" && \
-    export BUILD_PACKAGES="wget curl" && \
-    apt update -qq && \
-    apt install -qq --yes ${BUILD_PACKAGES} && \
-    #wget --quiet "https://github.com/vmware-tanzu/octant/releases/download/v${OCTANT_VERSION}/octant_${OCTANT_VERSION}_Linux-64bit.deb" -O octant.deb && \
-    curl -o /octant.deb -kL https://github.com/vmware-tanzu/octant/releases/download/$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//')/octant_$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//' | sed 's/v//' )_Linux-64bit.deb && \
-    dpkg -i "octant.deb" && \
-    rm -f "octant.deb" && \
-    apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
-    apt-get -qq --yes autoremove --purge && \
-    apt-get -qq --yes clean all && \
-    rm -rf "/usr/share/doc/"* \
-           "/var/cache/"* \
-           "/var/lib/apt/lists/"* \
-           "/usr/src/"* \
-           "/var/cache/"* \
-           "/var/log/"{apt/*,dpkg.log} \
-           "/tmp/"*
 
-#USER "iperf"
+FROM alpine:3
 
-LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
+WORKDIR /tmp
 
-CMD [ "/bin/bash", "-c", "/entrypoint.sh" ]
+RUN addgroup -g 2000 -S octant && adduser -u 1000 -h /home/octant -G octant -S octant
+
+COPY --from=builder /opt/octant /opt/octant
+COPY entrypoint.sh /
+
+ENTRYPOINT /entrypoint.sh
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
new file mode 100644
index 0000000..ec6cac4
--- /dev/null
+++ b/Dockerfile.ubuntu
@@ -0,0 +1,34 @@
+ARG  UBUNTU_VERSION="20.10"
+FROM "ubuntu:${UBUNTU_VERSION}"
+ARG  UBUNTU_VERSION
+
+#ARG OCTANT_VERSION="0.16.1"
+
+USER "root"
+
+COPY "entrypoint.sh" "/entrypoint.sh"
+
+RUN export DEBIAN_FRONTEND="noninteractive" && \
+    export BUILD_PACKAGES="wget curl" && \
+    apt update -qq && \
+    apt install -qq --yes ${BUILD_PACKAGES} && \
+    #wget --quiet "https://github.com/vmware-tanzu/octant/releases/download/v${OCTANT_VERSION}/octant_${OCTANT_VERSION}_Linux-64bit.deb" -O octant.deb && \
+    curl -o /octant.deb -kL https://github.com/vmware-tanzu/octant/releases/download/$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//')/octant_$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//' | sed 's/v//' )_Linux-64bit.deb && \
+    dpkg -i "octant.deb" && \
+    rm -f "octant.deb" && \
+    apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
+    apt-get -qq --yes autoremove --purge && \
+    apt-get -qq --yes clean all && \
+    rm -rf "/usr/share/doc/"* \
+           "/var/cache/"* \
+           "/var/lib/apt/lists/"* \
+           "/usr/src/"* \
+           "/var/cache/"* \
+           "/var/log/"{apt/*,dpkg.log} \
+           "/tmp/"*
+
+#USER "iperf"
+
+LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
+
+CMD [ "/bin/bash", "-c", "/entrypoint.sh" ]
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..34d33c6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# README
+
+source: https://github.com/aleveille/octant-dashboard-turnkey
diff --git a/entrypoint.sh b/entrypoint.sh
index 867a594..e95e99c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 export OCTANT_LISTENER_ADDR="0.0.0.0:7777"
-octant -vvv --disable-open-browser
+/opt/octant -vvv --disable-open-browser