diff --git a/Dockerfile b/Dockerfile index f382a99..1c7f04b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,3 +101,7 @@ ADD --chown=1000:1000 src/nodes.list . # Set default command CMD ["/bin/zsh"] + +FROM ghcr.io/growlf/toolbox:latest + +RUN groupadd -g 999 docker && usermod -aG docker ubuntu \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index dfed9d8..68d9cbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: dockerfile: Dockerfile image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=$${TESTVAR:/src} stdin_open: true tty: true command: ["/bin/zsh"] @@ -17,27 +17,29 @@ services: - ${HOME}/.ssh:/home/ubuntu/.ssh - .:/src - /var/run/docker.sock:/var/run/docker.sock - network_mode: "host" + # network_mode: "host" # Example container with DooD and host file/net access app1: image: ghcr.io/growlf/toolbox:latest + platform: linux/amd64 environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=$${TESTVAR:/src} stdin_open: true tty: true command: ["/bin/zsh"] volumes: - - /:/host + - .:/src - /var/run/docker.sock:/var/run/docker.sock - network_mode: "host" + user: root + # network_mode: "host" # Example of running the same image with different intent app2: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=$${TESTVAR:/src} stdin_open: true tty: true command: ["/bin/bash"] diff --git a/src/tasks.py b/src/tasks.py index b993590..ba9036c 100644 --- a/src/tasks.py +++ b/src/tasks.py @@ -57,8 +57,8 @@ def help(c, verbose=0): optional=['name'], incrementable=['verbose'] ) -def hello(c, name="world", verbose=0): - """Say hello +def gello(c, name="world", verbose=0): + """Say gello Args: c (_type_): _description_ @@ -69,7 +69,7 @@ def hello(c, name="world", verbose=0): logger.debug("Set loglevel.") print("Hello {}!".format(name)) - logger.debug("Said hello.") + logger.debug("Said gello.") @task(incrementable=['verbose'])