From c12e1294ae46ee48917b364a6fad00674e75d14e Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 14:55:49 -0700 Subject: [PATCH 01/11] explanation on env var --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index dfed9d8..c7136ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] From f6d377aceaed290217b5b40085de962ebafc7e84 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:02:22 -0700 Subject: [PATCH 02/11] task 3 --- docker-compose-deploy.yml | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docker-compose-deploy.yml diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml new file mode 100644 index 0000000..fc04c77 --- /dev/null +++ b/docker-compose-deploy.yml @@ -0,0 +1,45 @@ +version: '3.8' +services: + + # Building and testing environment + dev: + build: + context: . + dockerfile: Dockerfile + image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} + stdin_open: true + tty: true + command: ["/bin/zsh"] + volumes: + - ${HOME}/.gitconfig:/home/ubuntu/.gitconfig + - ${HOME}/.ssh:/home/ubuntu/.ssh + - .:/src + - /var/run/docker.sock:/var/run/docker.sock + network_mode: "host" + + # Example container with DooD and host file/net access + app1: + image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer + stdin_open: true + tty: true + command: ["/bin/zsh"] + volumes: + - /:/host + - /var/run/docker.sock:/var/run/docker.sock + network_mode: "host" + + + # Example of running the same image with different intent + app2: + image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} + stdin_open: true + tty: true + command: ["/bin/bash"] + + From 8c8fe11a64bd953e967f8757b9c3ca70427c4898 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:11:56 -0700 Subject: [PATCH 03/11] task 3 still --- docker-compose-deploy.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index fc04c77..3827dd5 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -7,8 +7,7 @@ services: context: . dockerfile: Dockerfile image: ghcr.io/growlf/toolbox:latest - environment: - - TESTVAR=${TESTVAR:/src} + stdin_open: true tty: true command: ["/bin/zsh"] @@ -36,10 +35,9 @@ services: # Example of running the same image with different intent app2: image: ghcr.io/growlf/toolbox:latest - environment: - - TESTVAR=${TESTVAR:/src} + stdin_open: true tty: true command: ["/bin/bash"] - + From e972fd9748e9d801778cf0cc258b8425372d5d98 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:13:15 -0700 Subject: [PATCH 04/11] task changes --- docker-compose-deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 3827dd5..ca4922f 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -21,8 +21,6 @@ services: # Example container with DooD and host file/net access app1: image: ghcr.io/growlf/toolbox:latest - environment: - - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] @@ -35,7 +33,6 @@ services: # Example of running the same image with different intent app2: image: ghcr.io/growlf/toolbox:latest - stdin_open: true tty: true command: ["/bin/bash"] From fb1445459d8cf84e31f18cf752fe123574f85e7b Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:16:46 -0700 Subject: [PATCH 05/11] test again --- docker-compose-deploy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index ca4922f..bae4106 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -1,4 +1,4 @@ -version: '3.8' + services: # Building and testing environment @@ -16,6 +16,7 @@ services: - ${HOME}/.ssh:/home/ubuntu/.ssh - .:/src - /var/run/docker.sock:/var/run/docker.sock + platform: linux/amd64 network_mode: "host" # Example container with DooD and host file/net access @@ -24,6 +25,7 @@ services: stdin_open: true tty: true command: ["/bin/zsh"] + platform: linux/amd64 volumes: - /:/host - /var/run/docker.sock:/var/run/docker.sock @@ -34,6 +36,7 @@ services: app2: image: ghcr.io/growlf/toolbox:latest stdin_open: true + platform: linux/amd64 tty: true command: ["/bin/bash"] From d25b9d149167ac38afbffbea20e854c2b99ea315 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:22:18 -0700 Subject: [PATCH 06/11] fnsa --- docker-compose-deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index bae4106..f2ae5d3 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -7,7 +7,6 @@ services: context: . dockerfile: Dockerfile image: ghcr.io/growlf/toolbox:latest - stdin_open: true tty: true command: ["/bin/zsh"] @@ -16,7 +15,6 @@ services: - ${HOME}/.ssh:/home/ubuntu/.ssh - .:/src - /var/run/docker.sock:/var/run/docker.sock - platform: linux/amd64 network_mode: "host" # Example container with DooD and host file/net access @@ -25,7 +23,6 @@ services: stdin_open: true tty: true command: ["/bin/zsh"] - platform: linux/amd64 volumes: - /:/host - /var/run/docker.sock:/var/run/docker.sock @@ -36,7 +33,6 @@ services: app2: image: ghcr.io/growlf/toolbox:latest stdin_open: true - platform: linux/amd64 tty: true command: ["/bin/bash"] From 42a40e40bbd629aadc3fb5dc6b4170909a29c82b Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:30:47 -0700 Subject: [PATCH 07/11] sdfafs --- docker-compose-deploy.yml | 9 +++++++-- docker-compose.yml | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index f2ae5d3..c7136ce 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -1,4 +1,4 @@ - +version: '3.8' services: # Building and testing environment @@ -7,6 +7,8 @@ services: context: . dockerfile: Dockerfile image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} stdin_open: true tty: true command: ["/bin/zsh"] @@ -20,6 +22,8 @@ services: # Example container with DooD and host file/net access app1: image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] @@ -32,8 +36,9 @@ services: # Example of running the same image with different intent app2: image: ghcr.io/growlf/toolbox:latest + environment: + - TESTVAR=${TESTVAR:/src} stdin_open: true tty: true command: ["/bin/bash"] - diff --git a/docker-compose.yml b/docker-compose.yml index c7136ce..18c8bd2 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"] @@ -23,7 +23,7 @@ services: app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer + - TESTVAR=${TESTVAR:/src}$ #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] @@ -37,7 +37,7 @@ services: app2: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=${TESTVAR:/src}$ stdin_open: true tty: true command: ["/bin/bash"] From e0dc35fae373181658008750a88882146baa02c2 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:32:38 -0700 Subject: [PATCH 08/11] FS --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 18c8bd2..a636d21 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"] @@ -23,7 +23,7 @@ services: app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src}$ #this is an environment variable that can be altered in portainer + - TESTVAR=${TESTVAR:-/src}$ #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] @@ -37,7 +37,7 @@ services: app2: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src}$ + - TESTVAR=${TESTVAR:-/src} stdin_open: true tty: true command: ["/bin/bash"] From 038bfd4e9d8d8d884ba352d785ce92e1cff279d3 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:33:36 -0700 Subject: [PATCH 09/11] sds --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a636d21..6aeba4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: '3.9' services: # Building and testing environment From 9e8f5d06d40201629f03d97631114cba7ce50c8e Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:35:18 -0700 Subject: [PATCH 10/11] hopeful --- docker-compose-deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index c7136ce..707acf9 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -1,4 +1,4 @@ -version: '3.8' + services: # Building and testing environment @@ -8,7 +8,7 @@ services: dockerfile: Dockerfile image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=${TESTVAR:-app} stdin_open: true tty: true command: ["/bin/zsh"] @@ -23,7 +23,7 @@ services: app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} #this is an environment variable that can be altered in portainer + - TESTVAR=${TESTVAR:-app1} #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] @@ -37,7 +37,7 @@ services: app2: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:/src} + - TESTVAR=${TESTVAR:-app2} stdin_open: true tty: true command: ["/bin/bash"] From 835f58f52f3d0b946e405c95526e8731a86d7fe8 Mon Sep 17 00:00:00 2001 From: Eliaspw15 Date: Fri, 14 Feb 2025 15:45:41 -0700 Subject: [PATCH 11/11] ss --- README.md | 1 - docker-compose-deploy.yml | 12 +----------- docker-compose.yml | 8 ++++---- portainer-compose.yml | 4 ++-- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c395b2e..fd0ec6d 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,6 @@ Use the `portainer-compose.yml` file and modify to your hearts content. ## Fixed grammer Fixed grammar - ## Notes - https://ohmyz.sh/#install diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 707acf9..7425d4c 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -12,32 +12,22 @@ services: stdin_open: true tty: true command: ["/bin/zsh"] - volumes: - - ${HOME}/.gitconfig:/home/ubuntu/.gitconfig - - ${HOME}/.ssh:/home/ubuntu/.ssh - - .:/src - - /var/run/docker.sock:/var/run/docker.sock network_mode: "host" # Example container with DooD and host file/net access app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:-app1} #this is an environment variable that can be altered in portainer + - TESTVAR=${TESTVAR:-/src} #this is an environment variable that can be altered in portainer stdin_open: true tty: true command: ["/bin/zsh"] - volumes: - - /:/host - - /var/run/docker.sock:/var/run/docker.sock network_mode: "host" # Example of running the same image with different intent app2: image: ghcr.io/growlf/toolbox:latest - environment: - - TESTVAR=${TESTVAR:-app2} stdin_open: true tty: true command: ["/bin/bash"] diff --git a/docker-compose.yml b/docker-compose.yml index 6aeba4c..0973e27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.9' +version: '3.8' services: # Building and testing environment @@ -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"] @@ -23,7 +23,7 @@ services: app1: image: ghcr.io/growlf/toolbox:latest environment: - - TESTVAR=${TESTVAR:-/src}$ #this is an environment variable that can be altered in portainer + - TESTVAR=${TESTVAR:/src} #this is an environment variable stdin_open: true tty: true command: ["/bin/zsh"] @@ -37,7 +37,7 @@ services: 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/portainer-compose.yml b/portainer-compose.yml index 0e3dbfc..037b113 100644 --- a/portainer-compose.yml +++ b/portainer-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' + services: # Building and testing environment @@ -6,7 +6,7 @@ services: build: context: . dockerfile: Dockerfile - image: ghcr.io/growlf/toolbox:testing + image: ghcr.io/growlf/toolbox:latest stdin_open: true tty: true command: ["/bin/zsh"]