Skip to content

Commit b07b40b

Browse files
deansheatherdeansheather
authored
chore: revert nix dogfood image (#11022)
The nix image isn't used because it doesn't work, and we haven't been updating our "pre-nix" tag since the changes were made. Reverts back to being a regular Dockerfile.
1 parent d70f9ea commit b07b40b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+594
-179
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Development environments on your infrastructure",
3-
"image": "codercom/oss-dogfood:pre-nix",
3+
"image": "codercom/oss-dogfood:latest",
44

55
"features": {
66
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker

‎.github/workflows/dogfood.yaml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ on:
55
branches:
66
- main
77
paths:
8-
- "flake.nix"
9-
- "flake.lock"
108
- "dogfood/**"
119
- ".github/workflows/dogfood.yaml"
1210
# Uncomment these lines when testing with CI.
1311
# pull_request:
1412
# paths:
15-
# - "flake.nix"
16-
# - "flake.lock"
1713
# - "dogfood/**"
1814
# - ".github/workflows/dogfood.yaml"
1915
workflow_dispatch:
@@ -37,24 +33,24 @@ jobs:
3733
tag=${tag//\//--}
3834
echo "tag=${tag}" >> $GITHUB_OUTPUT
3935
40-
- name: Install Nix
41-
uses: DeterminateSystems/nix-installer-action@v8
42-
43-
- name: Run the Magic Nix Cache
44-
uses: DeterminateSystems/magic-nix-cache-action@v2
45-
46-
- run: nix build .#devEnvImage && ./result | docker load
36+
- name: Set up Docker Buildx
37+
uses: docker/setup-buildx-action@v2
4738

4839
- name: Login to DockerHub
4940
uses: docker/login-action@v3
5041
with:
5142
username: ${{ secrets.DOCKERHUB_USERNAME }}
5243
password: ${{ secrets.DOCKERHUB_PASSWORD }}
5344

54-
- name: Tag and Push
55-
run: |
56-
docker tag codercom/oss-dogfood:latest codercom/oss-dogfood:${{ steps.docker-tag-name.outputs.tag }}
57-
docker push codercom/oss-dogfood -a
45+
- name: Build and push
46+
uses: docker/build-push-action@v4
47+
with:
48+
context: "{{defaultContext}}:dogfood"
49+
pull: true
50+
push: true
51+
tags: "codercom/oss-dogfood:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood:latest"
52+
cache-from: type=registry,ref=codercom/oss-dogfood:latest
53+
cache-to: type=inline
5854

5955
deploy_template:
6056
needs: deploy_image

0 commit comments

Comments
 (0)