From 056fbe273c10220b7363338f7a16712fc19edf9c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 5 Jun 2020 15:12:59 +0200 Subject: [PATCH] Update --- .gitignore | 3 ++- daemon/Dockerfile | 2 +- daemon/docker-entrypoint.sh | 0 docker-compose.yml | 1 + logs/dummy | 0 web/docker-entrypoint.sh | 0 6 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 daemon/docker-entrypoint.sh create mode 100644 logs/dummy mode change 100644 => 100755 web/docker-entrypoint.sh diff --git a/.gitignore b/.gitignore index 89f44724..b579273f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ +nopaque.log +nopaqued.log .DS_Store *.env -logs __pycache__ diff --git a/daemon/Dockerfile b/daemon/Dockerfile index db20eaee..52b8844e 100644 --- a/daemon/Dockerfile +++ b/daemon/Dockerfile @@ -25,9 +25,9 @@ USER nopaqued WORKDIR /home/nopaqued +COPY ["logger", "logger"] COPY ["notify", "notify"] COPY ["tasks", "tasks"] -COPY ["logger", "logger"] COPY ["decorators.py", "nopaqued.py", "requirements.txt", "./"] RUN python -m venv venv \ && venv/bin/pip install --requirement requirements.txt \ diff --git a/daemon/docker-entrypoint.sh b/daemon/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index 98ae4143..8b5c9992 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,6 +70,7 @@ services: - "/mnt/dind-swarm/nopaque:/mnt/dind-swarm/nopaque" - "/var/run/docker.sock:/var/run/docker.sock" - "./logs:/home/nopaqued/logs" + - "./daemon/logger:/home/nopaqued/logger" - "./daemon/notify:/home/nopaqued/notify" - "./daemon/decorators.py:/home/nopaqued/decorators.py" - "./daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh" diff --git a/logs/dummy b/logs/dummy new file mode 100644 index 00000000..e69de29b diff --git a/web/docker-entrypoint.sh b/web/docker-entrypoint.sh old mode 100644 new mode 100755