Make codespace run successfully (apache#25251)

rferolino · Aug 26, 2022 · 5b9aa48 · 5b9aa48
1 parent 210443e
commit 5b9aa48
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,9 +2,11 @@
     "name": "Apache Airflow - sqlite",
     "dockerComposeFile": [
         "../scripts/ci/docker-compose/devcontainer.yml",
-        "../scripts/ci/docker-compose/local.yml",
-        "../scripts/ci/docker-compose/backend-sqlite.yml",
+        "../scripts/ci/docker-compose/backend-sqlite.yml"
     ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
     "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",

diff --git a/.devcontainer/mysql/devcontainer.json b/.devcontainer/mysql/devcontainer.json
@@ -1,11 +1,13 @@
 {
     "name": "Apache Airflow - mysql",
     "dockerComposeFile": [
-        "../scripts/ci/docker-compose/devcontainer.yml",
-        "../scripts/ci/docker-compose/local.yml",
-        "../scripts/ci/docker-compose/backend-mysql.yml",
-        "../scripts/ci/docker-compose/devcontainer-mysql.yml"
+        "../../scripts/ci/docker-compose/devcontainer.yml",
+        "../../scripts/ci/docker-compose/backend-mysql.yml",
+        "../../scripts/ci/docker-compose/devcontainer-mysql.yml"
     ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
     "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",

diff --git a/.devcontainer/postgres/devcontainer.json b/.devcontainer/postgres/devcontainer.json
@@ -1,11 +1,13 @@
 {
     "name": "Apache Airflow - postgres",
     "dockerComposeFile": [
-        "../scripts/ci/docker-compose/devcontainer.yml",
-        "../scripts/ci/docker-compose/local.yml",
-        "../scripts/ci/docker-compose/backend-postgres.yml",
-        "../scripts/ci/docker-compose/devcontainer-postgres.yml"
+        "../../scripts/ci/docker-compose/devcontainer.yml",
+        "../../scripts/ci/docker-compose/backend-postgres.yml",
+        "../../scripts/ci/docker-compose/devcontainer-postgres.yml"
     ],
+    "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+    },
     "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",

diff --git a/scripts/ci/docker-compose/devcontainer.env b/scripts/ci/docker-compose/devcontainer.env
@@ -67,3 +67,4 @@ VERBOSE="false"
 VERBOSE_COMMANDS="false"
 VERSION_SUFFIX_FOR_PYPI=
 WHEEL_VERSION=0.36.2
+AIRFLOW_SOURCES=/workspaces/airflow
diff --git a/scripts/ci/docker-compose/devcontainer.yml b/scripts/ci/docker-compose/devcontainer.yml
@@ -18,6 +18,8 @@
 version: "3.7"
 services:
   airflow:
+    stdin_open: true  # docker run -i
+    tty: true  # docker run -t
     image: ghcr.io/apache/airflow/main/ci/python3.7
     env_file: devcontainer.env
     ports:
@@ -31,3 +33,6 @@ services:
       # Pass docker to inside of the container so that Kind and Moto tests can use it.
       - /var/run/docker.sock:/var/run/docker.sock
       - /dev/urandom:/dev/random   # Required to get non-blocking entropy source
+      # Mount the cloned repo from codspaces docker host into the container,
+      # this will keep /workspaces/airflow and /opt/airflow in sync.
+      - /var/lib/docker/codespacemount/workspace/airflow:/opt/airflow