Nieuwe networks

containers/fedora/config.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-arg "-p 5173:5173 --network dev-php"

containers/go/Containerfile

@@ -4,4 +4,6 @@ USER root
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
   dnf -y --setopt=keepcache=1 install go
 
+RUN go install golang.org/x/tools/gopls@latest
+
 USER user

containers/rider/config.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-arg "-p 8080:8080"
-arg "-p 8081:8081"
+arg "-p 8888:8888"

containers/rust/Containerfile

@@ -1,12 +1,24 @@
 FROM git.plabble.org/maurice/fedora:main
 
+USER root
+
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf -y --setopt=keepcache=1 install openssl-devel \
+  gcc-c++ libX11-devel alsa-lib-devel systemd-devel wayland-devel libxkbcommon-devel mesa-vulkan-drivers
+
+USER user
+
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN . '/home/user/.cargo/env' && rustup component add rust-analyzer
 
 # Raspberry Pi Pico tools
-RUN sudo dnf install -y \
-    systemd-devel \
-    pkg-config \
- && dnf clean all
-RUN . "$HOME/.cargo/env" && cargo install elf2uf2-rs --locked
-RUN . "$HOME/.cargo/env" && rustup target add thumbv6m-none-eabi
+# RUN sudo dnf install -y \
+#     systemd-devel \
+#     pkg-config \
+#  && dnf clean all
+# RUN . "$HOME/.cargo/env" && cargo install elf2uf2-rs --locked
+# RUN . "$HOME/.cargo/env" && rustup target add thumbv6m-none-eabi
+
+# WASM toolchain
+RUN curl https://drager.github.io/wasm-pack/installer/init.sh -sSf | sh
+RUN cargo install cargo-generate

containers/rust/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+arg "--device=/dev/bus/usb --privileged"

devc.sh

@@ -57,8 +57,8 @@ param_args() {
       arg "-v /run/user/$UID/bus:/tmp/bus"
       arg "-e HOST_HOME=$HOME" # Used to translate paths.
       ;;
-    -net) # Enable network dev-<container name>
-      arg "--network dev-$name"
+    -net) # Enable network 'dev-<container name>'' and 'devc'
+      arg "--network dev-$name --network devc"
       ;;
     -mnt) # Mount directory.
       shift
@@ -117,6 +117,7 @@ fi
 if [ "$(podman container inspect "$name" -f {{.State.Running}} 2>&1)" != 'true' ] || [[ $# -gt 0 ]]; then
   log "starting devcontainer..."
   podman network create --ignore "dev-$name"
+  podman network create --ignore "devc"
   podman container rm -f -t 0 "$name" 1>/dev/null
   podman run -td $(default_args) $(param_args $@) "$registry/$image"
 fi