From 5247f29134a0cda639707e0010f7461dc2e11ed7 Mon Sep 17 00:00:00 2001 From: Florent Poinsaut Date: Mon, 4 Dec 2023 09:41:47 +0100 Subject: [PATCH] Fix Docker Entrypoint mod --- api/21-alpine/Dockerfile | 1 - api/21-alpine/docker-entrypoint.sh | 0 bareos-db-migration/Dockerfile | 1 - bareos-db-migration/docker-entrypoint.sh | 0 client/21-alpine/Dockerfile | 1 - client/21-alpine/docker-entrypoint.sh | 0 client/21-ubuntu/Dockerfile | 1 - client/21-ubuntu/docker-entrypoint.sh | 0 client/nightly-ubuntu/Dockerfile | 1 - client/nightly-ubuntu/docker-entrypoint.sh | 0 director-pgsql/21-alpine/Dockerfile | 1 - director-pgsql/21-alpine/docker-entrypoint.sh | 0 director-pgsql/21-ubuntu/Dockerfile | 1 - director-pgsql/21-ubuntu/docker-entrypoint.sh | 0 director-pgsql/nightly-ubuntu/Dockerfile | 1 - director-pgsql/nightly-ubuntu/docker-entrypoint.sh | 0 storage/21-alpine/Dockerfile | 1 - storage/21-alpine/docker-entrypoint.sh | 0 storage/21-ubuntu/Dockerfile | 1 - storage/21-ubuntu/docker-entrypoint.sh | 0 storage/nightly-ubuntu/Dockerfile | 1 - storage/nightly-ubuntu/docker-entrypoint.sh | 0 webui/21-alpine/Dockerfile | 1 - webui/21-alpine/docker-entrypoint.sh | 0 webui/21-ubuntu/Dockerfile | 1 - webui/21-ubuntu/docker-entrypoint.sh | 0 webui/nightly-ubuntu/Dockerfile | 1 - webui/nightly-ubuntu/docker-entrypoint.sh | 0 28 files changed, 14 deletions(-) mode change 100644 => 100755 api/21-alpine/docker-entrypoint.sh mode change 100644 => 100755 bareos-db-migration/docker-entrypoint.sh mode change 100644 => 100755 client/21-alpine/docker-entrypoint.sh mode change 100644 => 100755 client/21-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 client/nightly-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 director-pgsql/21-alpine/docker-entrypoint.sh mode change 100644 => 100755 director-pgsql/21-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 director-pgsql/nightly-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 storage/21-alpine/docker-entrypoint.sh mode change 100644 => 100755 storage/21-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 storage/nightly-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 webui/21-alpine/docker-entrypoint.sh mode change 100644 => 100755 webui/21-ubuntu/docker-entrypoint.sh mode change 100644 => 100755 webui/nightly-ubuntu/docker-entrypoint.sh diff --git a/api/21-alpine/Dockerfile b/api/21-alpine/Dockerfile index 0a9d2bfd..176146e8 100644 --- a/api/21-alpine/Dockerfile +++ b/api/21-alpine/Dockerfile @@ -24,7 +24,6 @@ ENV PATH="/home/bareos/.local/bin:${PATH}" RUN pip install --no-cache-dir "bareos-restapi>=21*,<22*" COPY --chown=bareos docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod a+x /docker-entrypoint.sh EXPOSE 8000 diff --git a/api/21-alpine/docker-entrypoint.sh b/api/21-alpine/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/bareos-db-migration/Dockerfile b/bareos-db-migration/Dockerfile index 09b5e12f..e590de21 100644 --- a/bareos-db-migration/Dockerfile +++ b/bareos-db-migration/Dockerfile @@ -49,7 +49,6 @@ RUN apt-get update -qq \ RUN tar czf /bareos-dir.tgz /etc/bareos COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh VOLUME /etc/bareos diff --git a/bareos-db-migration/docker-entrypoint.sh b/bareos-db-migration/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/client/21-alpine/Dockerfile b/client/21-alpine/Dockerfile index 4e73d3fc..c7c46f77 100644 --- a/client/21-alpine/Dockerfile +++ b/client/21-alpine/Dockerfile @@ -27,7 +27,6 @@ RUN mkdir /run/bareos \ && chown bareos /run/bareos COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod a+x /docker-entrypoint.sh EXPOSE 9102 diff --git a/client/21-alpine/docker-entrypoint.sh b/client/21-alpine/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/client/21-ubuntu/Dockerfile b/client/21-ubuntu/Dockerfile index 7492f76c..2df516c0 100644 --- a/client/21-ubuntu/Dockerfile +++ b/client/21-ubuntu/Dockerfile @@ -36,7 +36,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod a+x /docker-entrypoint.sh RUN tar czf /bareos-fd.tgz /etc/bareos/bareos-fd.d diff --git a/client/21-ubuntu/docker-entrypoint.sh b/client/21-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/client/nightly-ubuntu/Dockerfile b/client/nightly-ubuntu/Dockerfile index 953c69b0..9cebf365 100644 --- a/client/nightly-ubuntu/Dockerfile +++ b/client/nightly-ubuntu/Dockerfile @@ -36,7 +36,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod a+x /docker-entrypoint.sh RUN tar czf /bareos-fd.tgz /etc/bareos/bareos-fd.d diff --git a/client/nightly-ubuntu/docker-entrypoint.sh b/client/nightly-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/director-pgsql/21-alpine/Dockerfile b/director-pgsql/21-alpine/Dockerfile index 8ff82add..7464d81b 100644 --- a/director-pgsql/21-alpine/Dockerfile +++ b/director-pgsql/21-alpine/Dockerfile @@ -27,7 +27,6 @@ COPY webhook-notify /usr/local/bin/webhook-notify RUN chmod u+x /usr/local/bin/webhook-notify COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh EXPOSE 9101 diff --git a/director-pgsql/21-alpine/docker-entrypoint.sh b/director-pgsql/21-alpine/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/director-pgsql/21-ubuntu/Dockerfile b/director-pgsql/21-ubuntu/Dockerfile index 3587d9af..3bff7e37 100644 --- a/director-pgsql/21-ubuntu/Dockerfile +++ b/director-pgsql/21-ubuntu/Dockerfile @@ -50,7 +50,6 @@ COPY webhook-notify /usr/local/bin/webhook-notify RUN chmod u+x /usr/local/bin/webhook-notify COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh EXPOSE 9101 diff --git a/director-pgsql/21-ubuntu/docker-entrypoint.sh b/director-pgsql/21-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/director-pgsql/nightly-ubuntu/Dockerfile b/director-pgsql/nightly-ubuntu/Dockerfile index b95f6381..dc7a3df5 100644 --- a/director-pgsql/nightly-ubuntu/Dockerfile +++ b/director-pgsql/nightly-ubuntu/Dockerfile @@ -50,7 +50,6 @@ COPY webhook-notify /usr/local/bin/webhook-notify RUN chmod u+x /usr/local/bin/webhook-notify COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh EXPOSE 9101 diff --git a/director-pgsql/nightly-ubuntu/docker-entrypoint.sh b/director-pgsql/nightly-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/storage/21-alpine/Dockerfile b/storage/21-alpine/Dockerfile index 1222fc1d..29b519ff 100644 --- a/storage/21-alpine/Dockerfile +++ b/storage/21-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN mkdir /run/bareos \ && chown bareos /run/bareos COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh EXPOSE 9103 diff --git a/storage/21-alpine/docker-entrypoint.sh b/storage/21-alpine/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/storage/21-ubuntu/Dockerfile b/storage/21-ubuntu/Dockerfile index 7b830fb5..5d7e666a 100644 --- a/storage/21-ubuntu/Dockerfile +++ b/storage/21-ubuntu/Dockerfile @@ -35,7 +35,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh RUN tar czf /bareos-sd.tgz /etc/bareos/bareos-sd.d diff --git a/storage/21-ubuntu/docker-entrypoint.sh b/storage/21-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/storage/nightly-ubuntu/Dockerfile b/storage/nightly-ubuntu/Dockerfile index af25c20a..20227dd4 100644 --- a/storage/nightly-ubuntu/Dockerfile +++ b/storage/nightly-ubuntu/Dockerfile @@ -35,7 +35,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh RUN tar czf /bareos-sd.tgz /etc/bareos/bareos-sd.d diff --git a/storage/nightly-ubuntu/docker-entrypoint.sh b/storage/nightly-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/webui/21-alpine/Dockerfile b/webui/21-alpine/Dockerfile index 89a67d6f..4ba8ac79 100644 --- a/webui/21-alpine/Dockerfile +++ b/webui/21-alpine/Dockerfile @@ -4,7 +4,6 @@ FROM alpine:3.16 RUN apk add --no-cache bareos-webui-nginx COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh RUN tar cfvz /bareos-webui-config.tgz /etc/bareos-webui RUN tar cfvz /bareos-webui-code.tgz /usr/share/bareos-webui RUN mkdir -p /run/nginx diff --git a/webui/21-alpine/docker-entrypoint.sh b/webui/21-alpine/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/webui/21-ubuntu/Dockerfile b/webui/21-ubuntu/Dockerfile index a2b80e06..251111e8 100644 --- a/webui/21-ubuntu/Dockerfile +++ b/webui/21-ubuntu/Dockerfile @@ -34,7 +34,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh RUN tar czf /bareos-webui.tgz /etc/bareos-webui diff --git a/webui/21-ubuntu/docker-entrypoint.sh b/webui/21-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/webui/nightly-ubuntu/Dockerfile b/webui/nightly-ubuntu/Dockerfile index cff75723..0f187101 100644 --- a/webui/nightly-ubuntu/Dockerfile +++ b/webui/nightly-ubuntu/Dockerfile @@ -34,7 +34,6 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN chmod u+x /docker-entrypoint.sh RUN tar czf /bareos-webui.tgz /etc/bareos-webui diff --git a/webui/nightly-ubuntu/docker-entrypoint.sh b/webui/nightly-ubuntu/docker-entrypoint.sh old mode 100644 new mode 100755