ci: Move collab to Dockerfile-collab (#18515)

This makes it possible to have multiple Dockerfiles, each with their own `.dockerignore`. Previously any docker builds would always include anything inside `.dockerignore`. I believe this feature may require `export DOCKER_BUILDKIT=1` but we use that in CI already.
d1y · Sep 30, 2024 · 74cba24 · 74cba24
1 parent 053e319
commit 74cba24
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
@@ -76,7 +76,11 @@ jobs:
           clean: false
 
       - name: Build docker image
-        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
+        run: |
+          docker build -f Dockerfile-collab \
+            --build-arg GITHUB_SHA=$GITHUB_SHA \
+            --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA \
+            .
 
       - name: Publish docker image
         run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}

diff --git a/.zed/settings.json b/.zed/settings.json
@@ -38,6 +38,10 @@
       }
     }
   },
+  "file_types": {
+    "Dockerfile": ["Dockerfile*[!dockerignore]"],
+    "Git Ignore": ["dockerignore"]
+  },
   "hard_tabs": false,
   "formatter": "auto",
   "remove_trailing_whitespace_on_save": true,

diff --git a/Dockerfile → Dockerfile-collab b/Dockerfile → Dockerfile-collab
diff --git a/.dockerignore → Dockerfile-collab.dockerignore b/.dockerignore → Dockerfile-collab.dockerignore