Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c18c4ca

Browse files
ThomasK33ThomasK33
committed
feat(flake.nix): switch dogfood dev image to buildNixShellImage from dockerTools
Change-Id: I4e011fe3a19d9a1375fbfd5223c910e59d66a5d9 Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent 84081e9 commit c18c4ca

File tree

8 files changed

+105
-96
lines changed

8 files changed

+105
-96
lines changed

‎.dockerignore

-6
This file was deleted.

‎.github/workflows/dogfood.yaml

+22-13
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ permissions:
2424
jobs:
2525
build_image:
2626
if: github.actor != 'dependabot[bot]' # Skip Dependabot PRs
27-
runs-on: ubuntu-latest
27+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || 'ubuntu-latest' }}
2828
steps:
2929
- name: Harden Runner
3030
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -34,6 +34,12 @@ jobs:
3434
- name: Checkout
3535
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3636

37+
- name: Setup Nix
38+
uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16
39+
40+
- name: Setup GHA Nix cache
41+
uses: DeterminateSystems/magic-nix-cache-action@6221693898146dc97e38ad0e013488a16477a4c4 # v9
42+
3743
- name: Get branch name
3844
id: branch-name
3945
uses: tj-actions/branch-names@6871f53176ad61624f978536bbf089c574dc19a2 # v8.0.1
@@ -71,18 +77,21 @@ jobs:
7177
push: ${{ github.ref == 'refs/heads/main' }}
7278
tags: "codercom/oss-dogfood:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood:latest"
7379

74-
- name: Build and push Nix image
75-
uses: depot/build-push-action@636daae76684e38c301daa0c5eca1c095b24e780 # v1.14.0
76-
with:
77-
project: b4q6ltmpzh
78-
token: ${{ secrets.DEPOT_TOKEN }}
79-
buildx-fallback: true
80-
context: "."
81-
file: "dogfood/contents/Dockerfile.nix"
82-
pull: true
83-
save: true
84-
push: ${{ github.ref == 'refs/heads/main' }}
85-
tags: "codercom/oss-dogfood-nix:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood-nix:latest"
80+
- name: Build Nix image
81+
run: nix build .#dev_image
82+
83+
- name: Push Nix image
84+
if: github.ref == 'refs/heads/main'
85+
run: |
86+
docker load -i result
87+
88+
CURRENT_SYSTEM=$(nix eval --impure --raw --expr 'builtins.currentSystem')
89+
90+
docker image tag codercom/oss-dogfood-nix:latest-$CURRENT_SYSTEM codercom/oss-dogfood-nix:${{ steps.docker-tag-name.outputs.tag }}
91+
docker image push codercom/oss-dogfood-nix:${{ steps.docker-tag-name.outputs.tag }}
92+
93+
docker image tag codercom/oss-dogfood-nix:latest-$CURRENT_SYSTEM codercom/oss-dogfood-nix:latest
94+
docker image push codercom/oss-dogfood-nix:latest
8695
8796
deploy_template:
8897
needs: build_image

‎Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -952,3 +952,6 @@ else
952952
pnpm playwright:test
953953
endif
954954
.PHONY: test-e2e
955+
956+
dogfood/contents/nix.hash: flake.nix flake.lock
957+
sha256sum flake.nix flake.lock >./dogfood/contents/nix.hash

‎dogfood/contents/Dockerfile.nix

-42
This file was deleted.

‎dogfood/contents/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ resource "docker_image" "dogfood" {
344344
data.docker_registry_image.dogfood.sha256_digest,
345345
sha1(join("", [for f in fileset(path.module, "files/*") : filesha1(f)])),
346346
filesha1("Dockerfile"),
347-
filesha1("Dockerfile.nix"),
347+
filesha1("nix.hash"),
348348
]
349349
keep_locally = true
350350
}

‎dogfood/contents/nix.hash

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1663be4dd26c90a9a743fa45cdc449b000a35e9b7f040d39ea70c4e99fa2b420 flake.nix
2+
2358e758b2369c744a3f38d5b6cd3a71e79fcb99bdbb3bdeb8d3a520cf46f19f flake.lock

‎flake.nix

+75-34
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717
};
1818
};
1919

20-
outputs = { self, nixpkgs, nixpkgs-pinned, flake-utils, drpc, pnpm2nix }:
21-
flake-utils.lib.eachDefaultSystem (system:
20+
outputs =
21+
{
22+
self,
23+
nixpkgs,
24+
nixpkgs-pinned,
25+
flake-utils,
26+
drpc,
27+
pnpm2nix,
28+
}:
29+
flake-utils.lib.eachDefaultSystem (
30+
system:
2231
let
2332
pkgs = import nixpkgs {
2433
inherit system;
@@ -32,17 +41,21 @@
3241
inherit system;
3342
};
3443

44+
formatter = pkgs.nixfmt-rfc-style;
45+
3546
nodejs = pkgs.nodejs_20;
3647
pnpm = pkgs.pnpm_9.override {
37-
inherit nodejs; # Ensure it points to the above nodejs version
48+
inherit nodejs; # Ensure it points to the above nodejs version
3849
};
3950

4051
# Check in https://search.nixos.org/packages to find new packages.
4152
# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
4253
# to update the lock file if packages are out-of-date.
4354

4455
# From https://nixos.wiki/wiki/Google_Cloud_SDK
45-
gdk = pkgs.google-cloud-sdk.withExtraComponents ([ pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin ]);
56+
gdk = pkgs.google-cloud-sdk.withExtraComponents [
57+
pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
58+
];
4659

4760
proto_gen_go_1_30 = pkgs.buildGoModule rec {
4861
name = "protoc-gen-go";
@@ -63,14 +76,16 @@
6376
# The minimal set of packages to build Coder.
6477
devShellPackages = with pkgs; [
6578
# google-chrome is not available on aarch64 linux
66-
(lib.optionalDrvAttr ( !stdenv.isLinux || !stdenv.isAarch64 ) google-chrome)
79+
(lib.optionalDrvAttr (!stdenv.isLinux || !stdenv.isAarch64) google-chrome)
6780
# strace is not available on OSX
68-
(lib.optionalDrvAttr ( !pkgs.stdenv.isDarwin ) strace)
81+
(lib.optionalDrvAttr (!pkgs.stdenv.isDarwin) strace)
6982
bat
7083
cairo
7184
curl
7285
delve
86+
dive
7387
drpc.defaultPackage.${system}
88+
formatter
7489
fzf
7590
gcc
7691
gdk
@@ -129,13 +144,22 @@
129144

130145
src = ./site/.;
131146
# Required for the `canvas` package!
132-
extraBuildInputs = with pkgs; [
133-
cairo
134-
pango
135-
pixman
136-
libpng libjpeg giflib librsvg
137-
python312Packages.setuptools
138-
] ++ ( lib.optionals stdenv.targetPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation xcbuild ] );
147+
extraBuildInputs =
148+
with pkgs;
149+
[
150+
cairo
151+
pango
152+
pixman
153+
libpng
154+
libjpeg
155+
giflib
156+
librsvg
157+
python312Packages.setuptools
158+
]
159+
++ (lib.optionals stdenv.targetPlatform.isDarwin [
160+
darwin.apple_sdk.frameworks.Foundation
161+
xcbuild
162+
]);
139163
installInPlace = true;
140164
distDir = "out";
141165
};
@@ -144,15 +168,20 @@
144168

145169
# To make faster subsequent builds, you could extract the `.zst`
146170
# slim bundle into it's own derivation.
147-
buildFat = osArch:
171+
buildFat =
172+
osArch:
148173
pkgs.buildGo122Module {
149174
name = "coder-${osArch}";
150175
# Updated with ./scripts/update-flake.sh`.
151176
# This should be updated whenever go.mod changes!
152-
vendorHash = "sha256-DNQ3UPQoiiWEatMPj6B7QGGy9qOSvOmjADsrr+drCBY=";
177+
vendorHash = "sha256-hJBNmHz9ZJLS/QTu8w8y1w/Yi45aSoaSeZ//ysllp6c=";
153178
proxyVendor = true;
154179
src = ./.;
155-
nativeBuildInputs = with pkgs; [ getopt openssl zstd ];
180+
nativeBuildInputs = with pkgs; [
181+
getopt
182+
openssl
183+
zstd
184+
];
156185
preBuild = ''
157186
# Replaces /usr/bin/env with an absolute path to the interpreter.
158187
patchShebangs ./scripts
@@ -177,7 +206,9 @@
177206
'';
178207
};
179208
in
180-
{
209+
rec {
210+
inherit formatter;
211+
181212
devShells = {
182213
default = pkgs.mkShell {
183214
buildInputs = devShellPackages;
@@ -186,26 +217,36 @@
186217
export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
187218
'';
188219

189-
LOCALE_ARCHIVE = with pkgs; lib.optionalDrvAttr stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
220+
LOCALE_ARCHIVE =
221+
with pkgs;
222+
lib.optionalDrvAttr stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
190223
};
191224
};
192225

193-
packages = {
194-
proto_gen_go = proto_gen_go_1_30;
195-
all = pkgs.buildEnv {
196-
name = "all-packages";
197-
paths = devShellPackages;
198-
};
199-
site = buildSite;
200-
201-
# Copying `OS_ARCHES` from the Makefile.
202-
linux_amd64 = buildFat "linux_amd64";
203-
linux_arm64 = buildFat "linux_arm64";
204-
darwin_amd64 = buildFat "darwin_amd64";
205-
darwin_arm64 = buildFat "darwin_arm64";
206-
windows_amd64 = buildFat "windows_amd64.exe";
207-
windows_arm64 = buildFat "windows_arm64.exe";
208-
};
226+
packages =
227+
{
228+
default = packages.${system};
229+
230+
site = buildSite;
231+
232+
# Copying `OS_ARCHES` from the Makefile.
233+
x86_64-linux = buildFat "linux_amd64";
234+
aarch64-linux = buildFat "linux_arm64";
235+
x86_64-darwin = buildFat "darwin_amd64";
236+
aarch64-darwin = buildFat "darwin_arm64";
237+
x86_64-windows = buildFat "windows_amd64.exe";
238+
aarch64-windows = buildFat "windows_arm64.exe";
239+
}
240+
// (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
241+
dev_image = pkgs.dockerTools.buildNixShellImage {
242+
name = "codercom/oss-dogfood-nix";
243+
tag = "latest-${system}";
244+
245+
drv = devShells.default.overrideAttrs (oldAttrs: {
246+
buildInputs = oldAttrs.buildInputs ++ [ pkgs.nix ];
247+
});
248+
};
249+
});
209250
}
210251
);
211252
}

‎scripts/update-flake.sh

+2
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,6 @@ echo "protoc-gen-go version: $PROTOC_GEN_GO_REV"
3737
PROTOC_GEN_GO_SHA256=$(nix-prefetch-git https://github.com/protocolbuffers/protobuf-go --rev "$PROTOC_GEN_GO_REV" | jq -r .hash)
3838
sed -i "s#\(sha256 = \"\)[^\"]*#\1${PROTOC_GEN_GO_SHA256}#" ./flake.nix
3939
40+
make dogfood/contents/nix.hash
41+
4042
echo "Flake updated successfully!"

0 commit comments

Comments
 (0)