diff --git a/old/Dockerfile b/old/Dockerfile index 4d4d9e7..7ffb4df 100644 --- a/old/Dockerfile +++ b/old/Dockerfile @@ -1,39 +1,7 @@ -# Debian base image -FROM registry.sw3.cz/valicek1/lxcbian-bullseye +# git bash openssh-server parallel vim cron npm nodejs logrotate -VOLUME /data - -# install dependencies -RUN apt-get update -RUN apt-get full-upgrade -y --no-install-recommends -RUN apt-get install -y --no-install-recommends \ - git bash openssh-server parallel vim cron npm nodejs logrotate -RUN apt-get clean - -# create executor user -RUN useradd --uid 10000 -ms /bin/bash executor - -# install crontab, enable cron -ADD crontab /etc/cron.d/repo-cloner-executor -RUN bash -c "dpkg -l | grep cron" -RUN systemctl enable ssh cron ADD dockerbin/* checker/* src/* /usr/local/bin/ -# remove tty autospawn from inittab -# disable motd -RUN echo > /etc/motd -# install tail logger -RUN npm i frontail -g -# enable frontail at startup -ADD startup-logcat /usr/local/bin -ADD logcat.service /etc/systemd/system -RUN systemctl enable logcat - -# enable log dumping & rotation -ADD startup-logdump /usr/local/bin -ADD syslog.logrotate /etc/logrotate.d/syslog -ADD logdump.service /etc/systemd/system -RUN systemctl enable logdump RUN ln -fs /usr/share/zoneinfo/Europe/Prague /etc/localtime diff --git a/old/crontab b/old/crontab deleted file mode 100644 index bea162e..0000000 --- a/old/crontab +++ /dev/null @@ -1,5 +0,0 @@ -# executor crontab -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -MAILTO="" -* * * * * executor /usr/local/bin/cron-command >> /home/executor/cron.log 2>&1 -0 0 * * * executor mv /home/executor/cron.log /home/executor/cron.old diff --git a/repo_cloner/initialization_wizard.py b/repo_cloner/initialization_wizard.py index 65687bc..1da10e9 100644 --- a/repo_cloner/initialization_wizard.py +++ b/repo_cloner/initialization_wizard.py @@ -36,7 +36,7 @@ def parse_args(): parser.add_argument( '--base-dir', help = 'path to directory containing whole cloner structure', required = True, default = None, type = str) - parser.add_argument('--colored', help = "enable colored log output even tty() is not detected") + parser.add_argument('--colored', help = "enable colored log output even tty() is not detected", action = "store_true") args = parser.parse_args() base_dir = Path(args.base_dir) diff --git a/repo_cloner/prepare_git_tree.py b/repo_cloner/prepare_git_tree.py index 753d885..5647ffa 100644 --- a/repo_cloner/prepare_git_tree.py +++ b/repo_cloner/prepare_git_tree.py @@ -85,7 +85,7 @@ def main() -> int: parser.add_argument("target", help = "path where to checkout") parser.add_argument("--checkout", help = "checkout this reference, otherwise default HEAD will be left") parser.add_argument('--debug', '-d', help = "enable debug output", action = 'store_true') - parser.add_argument('--colored', help = "enable colored log output even tty() is not detected") + parser.add_argument('--colored', help = "enable colored log output even tty() is not detected", action = "store_true") args = parser.parse_args() if args.debug: log.info(f"Setting loglevel to debug") diff --git a/repo_cloner/process_repository_dir.py b/repo_cloner/process_repository_dir.py index 2f29c4e..87d639f 100755 --- a/repo_cloner/process_repository_dir.py +++ b/repo_cloner/process_repository_dir.py @@ -107,7 +107,7 @@ def main() -> int: parser.add_argument('--base-dir', help = 'path to directory containing whole cloner structure', required = True, default = None, type = str) parser.add_argument('--debug', '-d', help = "enable debug output", action = 'store_true') - parser.add_argument('--colored', help = "enable colored log output even tty() is not detected") + parser.add_argument('--colored', help = "enable colored log output even tty() is not detected", action = "store_true") args = parser.parse_args() if args.debug: log.setLevel(logging.DEBUG)