Merge branch 'main' into main

uwu · Aug 6, 2024 · e34b605 · e34b605
2 parents 59d7e8d + 631b612
commit e34b605
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 329 deletions.
diff --git a/.github/devcontainer/base/.devcontainer/Dockerfile b/.github/devcontainer/base/.devcontainer/Dockerfile
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/code-server.conf b/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/code-server.conf
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/vnc.conf b/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/vnc.conf
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/logs/.gitkeep b/.github/devcontainer/base/.devcontainer/basic-env/supervisor/logs/.gitkeep
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/supervisord.conf b/.github/devcontainer/base/.devcontainer/basic-env/supervisor/supervisord.conf
diff --git a/.github/devcontainer/base/.devcontainer/devcontainer.json b/.github/devcontainer/base/.devcontainer/devcontainer.json
diff --git a/.github/devcontainer/base/.devcontainer/user-dirs.dirs b/.github/devcontainer/base/.devcontainer/user-dirs.dirs
diff --git a/.github/devcontainer/base/.devcontainer/xstartup b/.github/devcontainer/base/.devcontainer/xstartup
diff --git a/.github/devcontainer/ctf/.devcontainer/devcontainer.json b/.github/devcontainer/ctf/.devcontainer/devcontainer.json
@@ -0,0 +1,16 @@
+{
+    "image": "ghcr.io/uwu/basic-env/base:latest",
+
+    "features": {
+        "ghcr.io/devcontainers/features/python:1": {},
+        "ghcr.io/devcontainers/features/node:1": {
+            "nodeGypDependencies": false,
+            "installYarnUsingApt": false
+        },
+
+        "ghcr.io/phorcys420/devcontainer-features/burp-suite:latest": {},
+
+        "ghcr.io/phorcys420/devcontainer-features/ghidra:latest": {},
+        "ghcr.io/phorcys420/devcontainer-features/cutter:latest": {}
+    }
+}
diff --git a/.github/devcontainer/dart/.devcontainer/Dockerfile b/.github/devcontainer/dart/.devcontainer/Dockerfile
diff --git a/.github/devcontainer/dart/.devcontainer/devcontainer.json b/.github/devcontainer/dart/.devcontainer/devcontainer.json
diff --git a/.github/devcontainer/java/.devcontainer/devcontainer.json b/.github/devcontainer/java/.devcontainer/devcontainer.json
diff --git a/.github/devcontainer/javascript/.devcontainer/devcontainer.json b/.github/devcontainer/javascript/.devcontainer/devcontainer.json
diff --git a/.github/workflows/build-and-push-base.yml b/.github/workflows/build-and-push-base.yml
@@ -5,12 +5,12 @@ on:
   push:
     branches:
       - "main"
-    pull_requests:
-      branches:
-        - "main"
+  pull_request:
+    branches:
+      - "main"
 
 jobs:
   build:
     uses: uwu/basic-env/.github/workflows/_build-and-push.yml@main
     with:
-      image: base
+      image: ctf
diff --git a/.github/workflows/build-and-push-others.yml b/.github/workflows/build-and-push-others.yml