fix(docker): auto-build sdk & hub in build.rs #1972

NathanFlurry · 2025-01-30T03:21:10Z

Changes

cloudflare-workers-and-pages · 2025-01-30T03:21:11Z

Deploying rivet-hub with Cloudflare Pages

Latest commit:	`60c5a95`
Status:	✅ Deploy successful!
Preview URL:	https://24d1d03e.rivet-hub-7jb.pages.dev
Branch Preview URL:	https://01-29-fix-docker-auto-build.rivet-hub-7jb.pages.dev

View logs

NathanFlurry · 2025-01-30T03:21:52Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

How to use the Graphite Merge Queue

Add the label merge-queue to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

greptile-apps

PR Summary

This PR implements significant changes to the build system and Docker configuration. Here's a summary of the key modifications:

Introduces a new build ID system using timestamp+UUID instead of Git-based versioning across the hub application
Enhances build script visibility by capturing and displaying yarn command outputs in build.rs files
Modifies Docker configuration to support Node.js 22.x and adds caching for node dependencies

Key points to address:

Hardcoded FontAwesome package token in Dockerfile needs to be removed (marked as TODO)
Incorrect ENTRYPOINT commands in Dockerfile for isolate-v8-runner and container-runner stages using 'rivet-client'
Duplicate package installations in Dockerfile's apt-get commands need consolidation
Removal of Git-based versioning could impact development debugging capabilities
The new build ID system may cause unnecessary cache invalidation since it changes on every build

_{14 file(s) reviewed, 10 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

greptile-apps · 2025-01-30T03:21:49Z

.dockerignore

-!docker/monolith
-docker/monolith/*.md
+# Rust
+**/target


style: Duplicate target ignore pattern (appears again on line 16). Remove one instance.

Suggested change

**/target

**/target/

greptile-apps · 2025-01-30T03:21:49Z

.dockerignore

+**/.turbo
+**/.yarn
+**/dist/
+**/node_modules/
+**/target
+.turbo


style: Duplicate .turbo ignore pattern. Remove one instance.

Suggested change

**/.turbo

**/.yarn

**/dist/

**/node_modules/

**/target

.turbo

**/.turbo

**/.yarn

**/dist/

**/node_modules/

**/target

greptile-apps · 2025-01-30T03:21:54Z

.gitignore

 **/target
-**/target/
-**/*.rustfmt

 # JavaScript
 **/.cache/
+**/.turbo
+**/.yarn
 **/dist/
 **/node_modules/
+**/target


style: Duplicate **/target entries (lines 8 and 16). One of these should be removed to avoid confusion.

Suggested change

**/target

**/target/

**/*.rustfmt

# JavaScript

**/.cache/

**/.turbo

**/.yarn

**/dist/

**/node_modules/

**/target

**/target

# JavaScript

**/.cache/

**/.turbo

**/.yarn

**/dist/

**/node_modules/

greptile-apps · 2025-01-30T03:21:55Z

.gitignore

+**/target
 .turbo


style: Redundant .turbo entry. Already covered by **/.turbo on line 12.

Suggested change

**/target

.turbo

**/target

greptile-apps · 2025-01-30T03:21:58Z

docker/universal/Dockerfile

+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+
+# TODO: REMOVE
+ENV FONTAWESOME_PACKAGE_TOKEN=E7A94808-3467-4150-B90D-EABDAEB9E0B4


logic: Remove hardcoded FontAwesome token - this should be passed as a build arg or through a secrets mount

Suggested change

ENV FONTAWESOME_PACKAGE_TOKEN=E7A94808-3467-4150-B90D-EABDAEB9E0B4

ARG FONTAWESOME_PACKAGE_TOKEN

ENV FONTAWESOME_PACKAGE_TOKEN=${FONTAWESOME_PACKAGE_TOKEN}

greptile-apps · 2025-01-30T03:22:27Z

frontend/apps/hub/src/main.tsx

@@ -10,7 +10,7 @@ initThirdPartyProviders();
 rivetClient.cloud
 	.bootstrap()
 	.then((response) => {
-		run({ cacheKey: [response.deployHash, __APP_GIT_COMMIT__].join("-") });
+		run({ cacheKey: [response.deployHash, __APP_BUILD_ID__].join("-") });


style: This cache key will now change on every build instead of being tied to Git commits. Could cause more frequent cache invalidation than necessary in production.

greptile-apps · 2025-01-30T03:22:32Z

frontend/apps/hub/vite.config.ts

+		__APP_BUILD_ID__: JSON.stringify(
+			`${new Date().toISOString()}@${crypto.randomUUID()}`,
+		),


style: Build ID changes on every build, may cause excessive cache invalidation. Consider using a more stable identifier for development

greptile-apps · 2025-01-30T03:23:04Z

packages/common/hub-embed/build.rs

+	assert!(
+		yarn_check.is_ok() && yarn_check.unwrap().success(),
+		"yarn is not installed, please install yarn to build this project"
+	);


logic: unwrap() on yarn_check could panic if yarn_check.is_ok() is false. Consider using if-else logic instead of assert for better error handling.

Suggested change

assert!(

yarn_check.is_ok() && yarn_check.unwrap().success(),

"yarn is not installed, please install yarn to build this project"

);

if let Ok(status) = yarn_check {

if !status.success() {

return Err("yarn is installed but not working properly".into());

}

} else {

return Err("yarn is not installed, please install yarn to build this project".into());

}

greptile-apps · 2025-01-30T03:23:05Z

packages/common/hub-embed/build.rs

 	fs_extra::dir::copy(
-		dist_path,
+		dist_path.clone(),
 		out_dir,
-		&fs_extra::dir::CopyOptions::new().overwrite(true),
+		&fs_extra::dir::CopyOptions::new().content_only(true),
 	)?;


style: dist_path.clone() is unnecessary since PathBuf is moved in the fs_extra::dir::copy call and not used afterwards

Suggested change

fs_extra::dir::copy(

dist_path,

dist_path.clone(),

out_dir,

&fs_extra::dir::CopyOptions::new().overwrite(true),

&fs_extra::dir::CopyOptions::new().content_only(true),

)?;

fs_extra::dir::copy(

dist_path,

out_dir,

&fs_extra::dir::CopyOptions::new().content_only(true),

)?;

greptile-apps · 2025-01-30T03:23:40Z

site/src/generated/.gitignore

logic: Removing all gitignore rules from generated directory could cause build artifacts and temporary files to be tracked. Consider keeping at least some exclusion rules.

Suggested change

*

!.gitignore

!errorPages.json

!apiPages.json

!meta.json

cloudflare-workers-and-pages · 2025-01-30T03:25:37Z

Deploying rivet with Cloudflare Pages

Latest commit:	`60c5a95`
Status:	⚡️ Build in progress...

View logs

graphite-app · 2025-01-30T08:38:40Z

Merge activity

Jan 30, 3:38 AM EST: A user added this pull request to the Graphite merge queue.
Jan 30, 3:43 AM EST: CI is running for this PR on a draft PR: #1974
Jan 30, 3:45 AM EST: A user merged this pull request with the Graphite merge queue via draft PR: #1974.

## Changes

NathanFlurry mentioned this pull request Jan 30, 2025

docs: add cd site to dev instructions #1971

Closed

greptile-apps bot reviewed Jan 30, 2025

View reviewed changes

NathanFlurry force-pushed the 01-29-fix_docker_auto-build_sdk_hub_in_build.rs branch from c755e19 to ee5a532 Compare January 30, 2025 07:33

fix(docker): auto-build sdk & hub in build.rs

60c5a95

NathanFlurry force-pushed the 01-29-fix_docker_auto-build_sdk_hub_in_build.rs branch from ee5a532 to 60c5a95 Compare January 30, 2025 08:38

NathanFlurry changed the base branch from docs_add_cd_site_to_dev_instructions to 01-30-fix_hub_allow_clicking_continue_button_with_only_one_project_in_local_dev January 30, 2025 08:38

NathanFlurry mentioned this pull request Jan 30, 2025

fix(hub): allow clicking continue button with only one project in local dev #1973

Closed

NathanFlurry added a commit that referenced this pull request Jan 30, 2025

fix(docker): auto-build sdk & hub in build.rs (#1972)

36f37cc

 ## Changes

NathanFlurry mentioned this pull request Jan 30, 2025

docs: add FoundationDB macOS troubleshooting guide #1975

Closed

graphite-app bot closed this Jan 30, 2025

graphite-app bot deleted the 01-29-fix_docker_auto-build_sdk_hub_in_build.rs branch January 30, 2025 08:45

github-actions bot mentioned this pull request Jan 30, 2025

chore(main): release 25.1.0 #1839

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(docker): auto-build sdk & hub in build.rs #1972

fix(docker): auto-build sdk & hub in build.rs #1972

NathanFlurry commented Jan 30, 2025

cloudflare-workers-and-pages bot commented Jan 30, 2025 •

edited

Loading

NathanFlurry commented Jan 30, 2025 •

edited

Loading

greptile-apps bot left a comment

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

greptile-apps bot Jan 30, 2025

cloudflare-workers-and-pages bot commented Jan 30, 2025 •

edited

Loading

graphite-app bot commented Jan 30, 2025 •

edited

Loading

	ENV FONTAWESOME_PACKAGE_TOKEN=E7A94808-3467-4150-B90D-EABDAEB9E0B4
	ARG FONTAWESOME_PACKAGE_TOKEN
	ENV FONTAWESOME_PACKAGE_TOKEN=${FONTAWESOME_PACKAGE_TOKEN}

-	assert!(
-		yarn_check.is_ok() && yarn_check.unwrap().success(),
-		"yarn is not installed, please install yarn to build this project"
-	);
+	if let Ok(status) = yarn_check {
+		if !status.success() {
+			return Err("yarn is installed but not working properly".into());
+		}
+	} else {
+		return Err("yarn is not installed, please install yarn to build this project".into());
+	}

+*
+!.gitignore
+!errorPages.json
+!apiPages.json
+!meta.json

fix(docker): auto-build sdk & hub in build.rs #1972

fix(docker): auto-build sdk & hub in build.rs #1972

Conversation

NathanFlurry commented Jan 30, 2025

Changes

cloudflare-workers-and-pages bot commented Jan 30, 2025 • edited Loading

Deploying rivet-hub with Cloudflare Pages

NathanFlurry commented Jan 30, 2025 • edited Loading

How to use the Graphite Merge Queue

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

greptile-apps bot Jan 30, 2025

Choose a reason for hiding this comment

cloudflare-workers-and-pages bot commented Jan 30, 2025 • edited Loading

Deploying rivet with Cloudflare Pages

graphite-app bot commented Jan 30, 2025 • edited Loading

Merge activity

cloudflare-workers-and-pages bot commented Jan 30, 2025 •

edited

Loading

NathanFlurry commented Jan 30, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Jan 30, 2025 •

edited

Loading

graphite-app bot commented Jan 30, 2025 •

edited

Loading