Remove docker/ directory

this brings it in line with other packages
This commit is contained in:
Girish Ramakrishnan 2022-03-08 09:32:22 -08:00
parent ed82c69743
commit 059fc273f1
3 changed files with 5 additions and 6 deletions

View file

@ -1,12 +1,12 @@
FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
RUN mkdir -p /app/code RUN mkdir -p /app/code /app/pkg
WORKDIR /app/code WORKDIR /app/code
ARG VERSION=2.33.5 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 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" ] CMD [ "/app/pkg/start.sh" ]

View file

@ -11,14 +11,13 @@ fi
chown -R cloudron:cloudron /app/data 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" 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 fi
echo "=> Source custom variables" echo "=> Source custom variables"
source /app/data/prometheus_variables.sh source /app/data/prometheus_variables.sh
echo "=> Starting Prometheus" echo "=> Starting Prometheus with retention time of $retention_time"
echo "=> Starting 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}" 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}"