diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 22f92f4..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "Qt 6.8.0 Development Container", - "build": { - "dockerfile": "Dockerfile", - "context": "." - }, - "postStartCommand": "./.devcontainer/poststart.sh", - "runArgs": [ - "-e", "DISPLAY=${env:DISPLAY}", - "-v", "/tmp/.X11-unix:/tmp/.X11-unix" - ], - "customizations": { - "vscode": { - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, - "extensions": [ - "ms-vscode.cmake-tools", - "ms-vscode.cpptools", - "ms-vscode.makefile-tools", - "androidtool.android", - "ms-azuretools.vscode-docker", - "bbenoist.QML" - ] - } - }, - "forwardPorts": [8080], - "mounts": [ - "source=${localWorkspaceFolder},target=/workspace,type=bind" - ] -} \ No newline at end of file diff --git a/.devcontainer/poststart.sh b/.devcontainer/poststart.sh deleted file mode 100755 index 04752c0..0000000 --- a/.devcontainer/poststart.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "Welcome" \ No newline at end of file diff --git a/.gitea/workflows/build-container.yaml b/.gitea/workflows/build-container.yaml index e57a98d..7a1ed94 100644 --- a/.gitea/workflows/build-container.yaml +++ b/.gitea/workflows/build-container.yaml @@ -21,7 +21,7 @@ jobs: - name: Build Docker image run: | - docker build -t ${{ secrets.LOCAL_INSTANCE_IP }}/${{ secrets.DOCKER_USERNAME }}/devcontainer:latest -f .devcontainer/Dockerfile . + docker build -t ${{ secrets.LOCAL_INSTANCE_IP }}/${{ secrets.DOCKER_USERNAME }}/devcontainer:latest -f Dockerfile . - name: Push Docker image run: | diff --git a/.devcontainer/Dockerfile b/Dockerfile similarity index 100% rename from .devcontainer/Dockerfile rename to Dockerfile