Skip to content

Commit 74cba24

Browse files
authored
ci: Move collab to Dockerfile-collab (zed-industries#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.
1 parent 053e319 commit 74cba24

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.github/workflows/deploy_collab.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ jobs:
7676
clean: false
7777

7878
- name: Build docker image
79-
run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
79+
run: |
80+
docker build -f Dockerfile-collab \
81+
--build-arg GITHUB_SHA=$GITHUB_SHA \
82+
--tag registry.digitalocean.com/zed/collab:$GITHUB_SHA \
83+
.
8084
8185
- name: Publish docker image
8286
run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}

.zed/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
}
3939
}
4040
},
41+
"file_types": {
42+
"Dockerfile": ["Dockerfile*[!dockerignore]"],
43+
"Git Ignore": ["dockerignore"]
44+
},
4145
"hard_tabs": false,
4246
"formatter": "auto",
4347
"remove_trailing_whitespace_on_save": true,
File renamed without changes.

0 commit comments

Comments
 (0)