From 059fc273f1fe57eca59687a1ebff6620af482a74 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 8 Mar 2022 09:32:22 -0800
Subject: [PATCH] Remove docker/ directory

this brings it in line with other packages
---
 Dockerfile                                                 | 4 ++--
 ...metheus_variables.sh => default_prometheus_variables.sh | 0
 docker/app/pkg/start.sh => start.sh                        | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename docker/app/code/default_prometheus_variables.sh => default_prometheus_variables.sh (100%)
 rename docker/app/pkg/start.sh => start.sh (73%)

diff --git a/Dockerfile b/Dockerfile
index c783ab8..803a82d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
-RUN mkdir -p /app/code
+RUN mkdir -p /app/code /app/pkg
 WORKDIR /app/code
 
 ARG VERSION=2.33.5
 
 RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1
 
-COPY docker /
+COPY default_prometheus_variables.sh start.sh /app/pkg/
 
 CMD [ "/app/pkg/start.sh" ]
diff --git a/docker/app/code/default_prometheus_variables.sh b/default_prometheus_variables.sh
similarity index 100%
rename from docker/app/code/default_prometheus_variables.sh
rename to default_prometheus_variables.sh
diff --git a/docker/app/pkg/start.sh b/start.sh
similarity index 73%
rename from docker/app/pkg/start.sh
rename to start.sh
index 7a68d4b..45dfd96 100755
--- a/docker/app/pkg/start.sh
+++ b/start.sh
@@ -11,14 +11,13 @@ fi
 
 chown -R cloudron:cloudron /app/data
 
-if [ ! -f /app/data/prometheus_variables.sh ]; then
+if [[ ! -f /app/data/prometheus_variables.sh ]]; then
     echo "=> Copy default prometheus variable file since it does not exist"
-    cp /app/code/default_prometheus_variables.sh /app/data/prometheus_variables.sh
+    cp /app/pkg/default_prometheus_variables.sh /app/data/prometheus_variables.sh
 fi
 
 echo "=> Source custom variables"
 source /app/data/prometheus_variables.sh
 
-echo "=> Starting Prometheus"
-echo "=> Starting with retention time of $retention_time"
+echo "=> Starting Prometheus with retention time of $retention_time"
 exec /usr/local/bin/gosu cloudron:cloudron /app/code/prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime --storage.tsdb.retention.time="${retention_time:-15d}"