diff --git a/docker/command.cgi b/docker/command.cgi index b40f354..54f0902 100644 --- a/docker/command.cgi +++ b/docker/command.cgi @@ -3,7 +3,7 @@ use strict; use warnings; require './docker-lib.pl'; -#ui_print_header(undef, &text('index_title'), "", undef, 1, 1); + &ReadParse(); &error_setup(text('command_err')); @@ -26,5 +26,4 @@ if ($command == 'restart') { &error($err) if ($err); -&webmin_log(ucfirst($command), 'docker container', $in{'container'}); &redirect(""); \ No newline at end of file diff --git a/docker/docker-lib.pl b/docker/docker-lib.pl index 90277cc..d8b2563 100644 --- a/docker/docker-lib.pl +++ b/docker/docker-lib.pl @@ -132,12 +132,14 @@ sub container_command return "Command not allowed"; } - my ($code, $result) = docker_command($command . ' ' . $container); + my ($code, $result) = docker_command('container ' . $command . ' ' . $container); if ($code != 0) { + &webmin_log('Failed ' . $command, 'docker container', $in{'container'}); return $result; } - return $result; + &webmin_log(ucfirst($command), 'docker container', $in{'container'}); + return "" # successful commands only return the container name } sub circular_grid diff --git a/tools/dind/docker-compose.yml b/tools/dind/docker-compose.yml index 4b9b2e0..317dc55 100644 --- a/tools/dind/docker-compose.yml +++ b/tools/dind/docker-compose.yml @@ -1,7 +1,5 @@ version: '3.5' services: webmin: - container_name: alpine - image: alpine:latest - restart: on-failure - command: ["sleep","infinity"] \ No newline at end of file + container_name: syslog_appliance_alpine + image: rsyslog/syslog_appliance_alpine