From ff2ec7fc67a96a0a64bde0f2d55dc9cd5e4c1731 Mon Sep 17 00:00:00 2001
From: dheninli <dheninli@picasoft.net>
Date: Mon, 13 May 2019 18:22:55 +0200
Subject: [PATCH] Finished Dockerfile and removed useless ones
---
pica-wekan-scripts/Dockerfile | 4 +++-
pica-wekan-scripts/docker-compose.yml | 4 +---
pica-wekan/Dockerfile-clean | 15 ---------------
pica-wekan/docker-compose-clean.yml | 10 ----------
4 files changed, 4 insertions(+), 29 deletions(-)
delete mode 100644 pica-wekan/Dockerfile-clean
delete mode 100644 pica-wekan/docker-compose-clean.yml
diff --git a/pica-wekan-scripts/Dockerfile b/pica-wekan-scripts/Dockerfile
index bb594cb2..a6b33605 100644
--- a/pica-wekan-scripts/Dockerfile
+++ b/pica-wekan-scripts/Dockerfile
@@ -4,6 +4,8 @@ ENV DRYRUN=1
COPY *.sh ./
-RUN apk add --no-cache curl jq
+RUN apk add --no-cache --update curl jq
ENTRYPOINT /bin/sh ./run.sh
+
+
diff --git a/pica-wekan-scripts/docker-compose.yml b/pica-wekan-scripts/docker-compose.yml
index 3309b72f..bc8dc259 100644
--- a/pica-wekan-scripts/docker-compose.yml
+++ b/pica-wekan-scripts/docker-compose.yml
@@ -2,9 +2,7 @@ version: '3'
services:
wekan-cleaner:
- build:
- context: ./
- dockerfile: Dockerfile-clean
+ image: registry.picasoft.net/pica-wekan-clean
environment:
- DRYRUN=1
container_name: wekan_clean
diff --git a/pica-wekan/Dockerfile-clean b/pica-wekan/Dockerfile-clean
deleted file mode 100644
index 08d51b70..00000000
--- a/pica-wekan/Dockerfile-clean
+++ /dev/null
@@ -1,15 +0,0 @@
-from alpine
-
-ENV DRYRUN=true
-
-# COPY test.sh ./
-
-RUN apk add --no-cache curl jq
-RUN if [ $DRYRUN = false ]; \
- then \
- export ARGS="-d";\
- else \
- export ARGS="-t";\
- fi
-
-ENTRYPOINT /bin/sh ./test.sh
diff --git a/pica-wekan/docker-compose-clean.yml b/pica-wekan/docker-compose-clean.yml
deleted file mode 100644
index 3c83a081..00000000
--- a/pica-wekan/docker-compose-clean.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: '3'
-
-services:
- wekan-cleaner:
- build:
- context: ./
- dockerfile: Dockerfile-clean
- environment:
- - DRYRUN=false
- container_name: wekan_clean
--
GitLab