From aa14ff9b65c2dd6caa00dc5e5e0522d597cc00f0 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 4 Oct 2023 17:23:21 +0100 Subject: [PATCH] Switch to tini for init in container --- API.py | 18 ++++++++++++++++++ docker-configs/Dockerfile-ci | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/API.py b/API.py index 40b300a..0349c20 100644 --- a/API.py +++ b/API.py @@ -1,3 +1,21 @@ +# +############################################################################### +# Copyright (C) 2023 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### from spyne import ServiceBase, rpc, Integer, Decimal, UnsignedInteger32, Unicode, Iterable, error from dmr_utils3.utils import bytes_3, bytes_4 diff --git a/docker-configs/Dockerfile-ci b/docker-configs/Dockerfile-ci index 6ae960f..82b1ab7 100644 --- a/docker-configs/Dockerfile-ci +++ b/docker-configs/Dockerfile-ci @@ -17,7 +17,8 @@ ############################################################################### FROM python:3.11-alpine -ENTRYPOINT [ "/entrypoint" ] +#ENTRYPOINT [ "/entrypoint" ] +ENTRYPOINT ["/tini", "-g", "--", "/entrypoint"] COPY . /opt/freedmr @@ -25,6 +26,7 @@ RUN addgroup -g 54000 freedmr && \ adduser -D -u 54000 -G freedmr freedmr && \ apk update && \ apk add git gcc musl-dev && \ + apk add --no-cache tini && \ cd /opt && \ cd /opt/freedmr && \ ls -lah && \ @@ -36,5 +38,5 @@ RUN addgroup -g 54000 freedmr && \ COPY docker-configs/entrypoint-proxy /entrypoint USER freedmr -# +