From 8be0e326ca82e7e71b4a27246f38e9f64c0ca58e Mon Sep 17 00:00:00 2001 From: maurice Date: Fri, 31 Oct 2025 11:20:16 +0100 Subject: [PATCH] Updates --- containers/android/env | 1 - containers/fedora/config.sh | 2 ++ containers/rider/config.sh | 3 +++ containers/rider/env | 1 - devc.sh | 8 ++++---- 5 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 containers/android/env create mode 100644 containers/fedora/config.sh create mode 100644 containers/rider/config.sh delete mode 100644 containers/rider/env diff --git a/containers/android/env b/containers/android/env deleted file mode 100644 index a82a63b..0000000 --- a/containers/android/env +++ /dev/null @@ -1 +0,0 @@ -DEVC_COMMAND=/home/user/AndroidStudio/bin/studio \ No newline at end of file diff --git a/containers/fedora/config.sh b/containers/fedora/config.sh new file mode 100644 index 0000000..c7cfb14 --- /dev/null +++ b/containers/fedora/config.sh @@ -0,0 +1,2 @@ +#!/bin/bash +arg "-p 8080:8080" diff --git a/containers/rider/config.sh b/containers/rider/config.sh new file mode 100644 index 0000000..d0e2d31 --- /dev/null +++ b/containers/rider/config.sh @@ -0,0 +1,3 @@ +#!/bin/bash +arg "-p 8080:8080" +arg "-p 8081:8081" diff --git a/containers/rider/env b/containers/rider/env deleted file mode 100644 index d58a67c..0000000 --- a/containers/rider/env +++ /dev/null @@ -1 +0,0 @@ -DEVC_COMMAND=/home/user/Rider/bin/rider \ No newline at end of file diff --git a/devc.sh b/devc.sh index 190d675..c0cf893 100755 --- a/devc.sh +++ b/devc.sh @@ -60,6 +60,9 @@ param_args() { arg "-v /run/user/$UID/bus:/tmp/bus" arg "-e HOST_HOME=$HOME" # Used to translate paths. ;; + -net) # Enable network dev- + arg "--network dev-$name" + ;; -x11) # Enable X11 support. arg "-v /tmp/.X11-unix:/tmp/.X11-unix" arg "-v $XAUTHORITY:/run/user/1000/.Xauthority:ro" @@ -89,10 +92,6 @@ else fi name="${image%:*}" -# check if ENV file is present, if so, source it -env_file="$(dirname "$(realpath "$0")")/containers/$name/env" -[ -f "$env_file" ] && source "${env_file}" - # Get container registry from the DEVC_REGISTRY env # variable. if [ -n "${DEVC_REGISTRY:-}" ]; then @@ -112,6 +111,7 @@ fi # recreate it. if [ "$(podman container inspect "$name" -f {{.State.Running}} 2>&1)" != 'true' ] || [[ $# -gt 0 ]]; then log "starting devcontainer..." + podman network create --ignore "dev-$name" podman container rm -f -t 0 "$name" 1>/dev/null podman run -td $(default_args) $(param_args $@) "$registry/$image" fi