From 60d74112dc0a6e9ee1a18a74c210e5f5968509fb Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Sat, 18 Jul 2026 08:44:23 +0200 Subject: [PATCH] feat: first working version --- base/Dockerfile | 2 ++ build.sh | 18 +++++++++++++----- python/Dockerfile | 6 ++++++ python/docker-compose.yml | 0 scripts/base-container | 14 +++++++------- scripts/webserver-container | 10 +++------- vue/docker-compose.yml | 0 7 files changed, 31 insertions(+), 19 deletions(-) delete mode 100644 python/docker-compose.yml delete mode 100644 vue/docker-compose.yml diff --git a/base/Dockerfile b/base/Dockerfile index a4a707b..040f1a7 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -5,4 +5,6 @@ LABEL org.opencontainers.image.description="janishutz dev containers base image, RUN pacman --noconfirm -Sy fish wget git +WORKDIR /mnt + CMD [ "fish" ] diff --git a/build.sh b/build.sh index 5348b41..ee33b6f 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + echo " Building base container " @@ -14,13 +16,19 @@ echo " Building Vue container " ./build-helper.sh git.janishutz.com/registry/dev-container-vue vue -# -# echo " -# Building Python container -# " -# ./build-helper.sh git.janishutz.com/registry/dev-container-python python + +echo " +Building Python container +" +./build-helper.sh git.janishutz.com/registry/dev-container-python python # # echo " # Building php container # " # ./build-helper.sh git.janishutz.com/registry/dev-container-php php + +echo " + +==> Build successful at $(date) + +" diff --git a/python/Dockerfile b/python/Dockerfile index e69de29..bf16ba0 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -0,0 +1,6 @@ +FROM git.janishutz.com/registry/dev-container-base + +RUN pacman --noconfirm -S python python-pip python-yaml python-wheel python-scipy \ + python-numpy python-pillow python-jsonschema python-pytest python-installer \ + python-colorama python-matplotlib python-setuptools python-sympy python-packaging \ + python-pyaml python-argcomplete python-cryptography diff --git a/python/docker-compose.yml b/python/docker-compose.yml deleted file mode 100644 index e69de29..0000000 diff --git a/scripts/base-container b/scripts/base-container index d3ce017..ead41cb 100755 --- a/scripts/base-container +++ b/scripts/base-container @@ -4,13 +4,13 @@ containername=$([[ $1 ]] && echo $1 || echo "devcontainer") containermount=$([[ $2 ]] && echo $2 || echo "$HOME/projects/") echo " -=> Mounting folder to /mnt +=> Mounting folder $containermount to /mnt (in container) " docker run -it \ - -v $containermount:/mnt \ - -v ~/.config/fish:/root/.config/fish \ - -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ - --name $containername \ - -w /mnt \ - git.janishutz.com/registry/dev-container-base + -v $containermount:/mnt \ + -v ~/.config/fish:/root/.config/fish \ + -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ + --name $containername \ + -w /mnt \ + git.janishutz.com/registry/dev-container-base diff --git a/scripts/webserver-container b/scripts/webserver-container index 5964302..87b7245 100755 --- a/scripts/webserver-container +++ b/scripts/webserver-container @@ -3,11 +3,7 @@ containername=$([[ $1 ]] && echo $1 || echo "webserver") containermount=$([[ $2 ]] && echo $2 || echo "$HOME/projects/") -echo " -=> Mounting folder to /mnt -" - docker run --rm \ - -v $containermount:/mnt \ - git.janishutz.com/registry/dev-container-base -# TODO: Update the used image + -v $containermount:/var/www/html \ + --name $containername \ + erseco/alpine-php-webserver diff --git a/vue/docker-compose.yml b/vue/docker-compose.yml deleted file mode 100644 index e69de29..0000000