Fix devcontainer

Author: GermanCoding

.devcontainer/Dockerfile

@@ -69,9 +69,4 @@ RUN echo "export HISTFILE=/home/vscode/commandhistory/.bash_history" >> "/home/v
     && touch /home/vscode/commandhistory/.bash_history \
     && chown -R vscode /home/vscode/commandhistory    
 
-COPY docker-init.sh /usr/local/bin/docker-init.sh
-
-RUN chmod +x /usr/local/bin/docker-init.sh
-
-ENTRYPOINT ["/usr/local/bin/docker-init.sh"]
 CMD ["sleep", "infinity"]

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,9 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      "version": "2.16.1",
+      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd",
+      "integrity": "sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd"
+    }
+  }
+}

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
   "overrideCommand": false,
   "init": true,
 	"runArgs": [
-		"--userns=keep-id"
+		// "--userns=keep-id"
 	],
 	"remoteUser": "vscode",
   "containerUser": "vscode",
@@ -38,5 +38,10 @@
       ]
     }
   },
-  "postStartCommand": "bash .devcontainer/postCreateCommands.sh"
+  "postStartCommand": "bash .devcontainer/postCreateCommands.sh",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      "moby": "false"
+    }
+  }
 }

.devcontainer/docker-init.sh

@@ -6,25 +6,6 @@ set -euo pipefail
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-start_docker() {
-    if docker info >/dev/null 2>&1; then
-        return 0
-    fi
-
-    sudo mkdir -p /var/log
-    sudo nohup dockerd >/var/log/dockerd.log 2>&1 &
-
-    for _ in $(seq 1 30); do
-        if docker info >/dev/null 2>&1; then
-            return 0
-        fi
-        sleep 1
-    done
-
-    sudo tail -n 200 /var/log/dockerd.log >&2 || true
-    return 1
-}
-
 # for d in "/usr/local/etc/php/conf.d" "${PHP_INI_DIR}/conf.d"; do
 #     if [ -n "$d" ] && [ -d "$d" ]; then
 #         echo "Setting PHP CLI memory_limit=-1 in $d/99-memory-limit.ini"
@@ -56,6 +37,4 @@ if ! grep -qxF ". /usr/share/bash-completion/bash_completion" "$HOME"/.bashrc; t
     echo ". /usr/share/bash-completion/bash_completion" >> "$HOME"/.bashrc
 fi
 
-start_docker
-
 ./scripts/run-app.sh

.devcontainer/postCreateCommands.sh

@@ -111,7 +111,7 @@ local: build
 	docker compose kill || true
 	docker stop nextcloud-container || true
 	docker container rm nextcloud-container || true
-	docker run --rm -d -p 8080:80 --name nextcloud-container -e SERVER_BRANCH="v32.0.0" -v .:/var/www/html/apps-extra/gdatavaas ghcr.io/juliusknorr/nextcloud-dev-php84:latest
+	docker run --rm -d -p 8080:80 --name nextcloud-container -e SERVER_BRANCH="v33.0.0" -v .:/var/www/html/apps-extra/gdatavaas ghcr.io/juliusknorr/nextcloud-dev-php84:latest
 	composer install
 
 # Builds the app for production and prepares it for the appstore under ./build/artifacts

Makefile

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 rm -rf nextcloud-server/
-export NEXTCLOUD_VERSION=${1:-32.0.0}
+export NEXTCLOUD_VERSION=${1:-33.0.0}
 git clone --depth 1 --recurse-submodules --single-branch --branch v"$NEXTCLOUD_VERSION" https://github.com/nextcloud/server.git ./nextcloud-server
 cd nextcloud-server || exit 1
 git submodule update --init

scripts/get-nc-server.sh

@@ -6,7 +6,7 @@
 
 set -e
 
-export NEXTCLOUD_VERSION=${1:-32.0.0}
+export NEXTCLOUD_VERSION=${1:-33.0.0}
 export IS_CI=${2:-0}
 
 if [ "$IS_CI" -eq 0 ]; then