Skip to content

Commit de7c6c0

Browse files
Yohe-AmYohe-Am
committed
fix: dockerfile issues
1 parent 750794d commit de7c6c0

File tree

10 files changed

+72
-34
lines changed

10 files changed

+72
-34
lines changed

‎.ghjk/deno.jsonc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{
2-
}
1+
{}

‎.ghjk/lock.json

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -963,15 +963,15 @@
963963
"installs": [
964964
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
965965
],
966-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
966+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
967967
},
968968
"ghjkEnvProvInstSet____rust": {
969969
"installs": [
970970
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
971971
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
972972
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
973973
],
974-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
974+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
975975
},
976976
"ghjkEnvProvInstSet___dev": {
977977
"installs": [
@@ -998,7 +998,7 @@
998998
"bciqcknmodahoqnio4gvpyuzz23qv4weamu3korfqbr4vn5wslrbf2nq",
999999
"bciqhysoqxfk7gtf4oovif55idffettoytdccvsn7ujct5chnn34bowy"
10001000
],
1001-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1001+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10021002
},
10031003
"ghjkEnvProvInstSet___oci": {
10041004
"installs": [
@@ -1011,7 +1011,7 @@
10111011
"bciqcknmodahoqnio4gvpyuzz23qv4weamu3korfqbr4vn5wslrbf2nq",
10121012
"bciqhysoqxfk7gtf4oovif55idffettoytdccvsn7ujct5chnn34bowy"
10131013
],
1014-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1014+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10151015
},
10161016
"ghjkEnvProvInstSet___ci": {
10171017
"installs": [
@@ -1034,7 +1034,7 @@
10341034
"bciqcknmodahoqnio4gvpyuzz23qv4weamu3korfqbr4vn5wslrbf2nq",
10351035
"bciqhysoqxfk7gtf4oovif55idffettoytdccvsn7ujct5chnn34bowy"
10361036
],
1037-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1037+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10381038
},
10391039
"ghjkEnvProvInstSet____ecma": {
10401040
"installs": [
@@ -1043,7 +1043,7 @@
10431043
"bciqiogz5bcny4t5x3stgk4leobpzzfl5mkj2wak5xwlkw6ujetujvxy",
10441044
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10451045
],
1046-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1046+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10471047
},
10481048
"ghjkEnvProvInstSet____python": {
10491049
"installs": [
@@ -1052,7 +1052,7 @@
10521052
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y",
10531053
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10541054
],
1055-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1055+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10561056
},
10571057
"ghjkEnvProvInstSet____wasm": {
10581058
"installs": [
@@ -1062,7 +1062,7 @@
10621062
"bciqhysoqxfk7gtf4oovif55idffettoytdccvsn7ujct5chnn34bowy",
10631063
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10641064
],
1065-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1065+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10661066
},
10671067
"ghjkEnvProvInstSet_______task_env_gen-subs-protoc": {
10681068
"installs": [
@@ -1071,15 +1071,15 @@
10711071
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
10721072
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10731073
],
1074-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1074+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10751075
},
10761076
"ghjkEnvProvInstSet_______task_env_lint-udeps": {
10771077
"installs": [
10781078
"bciqomss4zvx6s4jhqsfvfw7jcau3jmsj6bodccmhnegxxkxbhn77xua",
10791079
"bciqpqxx2mr6lquenuilftktaehldlel5yzogfkkbrj45fizrrg6yxza",
10801080
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10811081
],
1082-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1082+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10831083
},
10841084
"ghjkEnvProvInstSet_______task_env_dev-website": {
10851085
"installs": [
@@ -1091,7 +1091,7 @@
10911091
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
10921092
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y"
10931093
],
1094-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1094+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
10951095
},
10961096
"ghjkEnvProvInstSet_______task_env_test-rust": {
10971097
"installs": [
@@ -1105,7 +1105,7 @@
11051105
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
11061106
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y"
11071107
],
1108-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1108+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11091109
},
11101110
"ghjkEnvProvInstSet_______task_env_dev-eg-tgraphs": {
11111111
"installs": [
@@ -1119,7 +1119,7 @@
11191119
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
11201120
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y"
11211121
],
1122-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1122+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11231123
},
11241124
"ghjkEnvProvInstSet_______task_env_build-tgraph-py": {
11251125
"installs": [
@@ -1130,15 +1130,15 @@
11301130
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
11311131
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y"
11321132
],
1133-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1133+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11341134
},
11351135
"ghjkEnvProvInstSet_______task_env_build-tgraph-rpc": {
11361136
"installs": [
11371137
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11381138
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
11391139
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
11401140
],
1141-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1141+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11421142
},
11431143
"ghjkEnvProvInstSet_______task_env_build-tgraph-ts": {
11441144
"installs": [
@@ -1149,7 +1149,7 @@
11491149
"bciqe4reyqmdatxmfbejk6gt7iv4qpoamcw4iteytbe4qy5urljdn25i",
11501150
"bciqiogz5bcny4t5x3stgk4leobpzzfl5mkj2wak5xwlkw6ujetujvxy"
11511151
],
1152-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1152+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11531153
},
11541154
"ghjkEnvProvInstSet_______task_env_build-sys-tgraphs": {
11551155
"installs": [
@@ -1160,7 +1160,7 @@
11601160
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
11611161
"bciqlwe4zmb5fd7wrnaat4bdbdemnhbzqahckctjsqpb6ierehd62i5y"
11621162
],
1163-
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
1163+
"allowedBuildDeps": "bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a"
11641164
}
11651165
}
11661166
}
@@ -2540,7 +2540,7 @@
25402540
"portRef": "[email protected]"
25412541
}
25422542
},
2543-
"bciqbmz6w55lwziebnxjhyaji6aevp3dfsvpi3hf43pbdcexzufb2ggy": {
2543+
"bciqjcspss2h46mtoacw7amxxnidegz42l2z3xccz6wdkbvmbq5ejnei": {
25442544
"manifest": {
25452545
"ty": "denoWorker@v1",
25462546
"name": "rust_rustup",
@@ -2578,14 +2578,10 @@
25782578
"profile": "default",
25792579
"components": [
25802580
"rust-src"
2581-
],
2582-
"targets": [
2583-
"wasm32-unknown-unknown",
2584-
"wasm32-wasip1"
25852581
]
25862582
}
25872583
},
2588-
"bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry": {
2584+
"bciqeojm4kfjco4kddssjuppicjucfgzlt6xeldbkso7usopi2lxln5a": {
25892585
"tar_aa": "bciqb6ua63xodzwxngnbjq35hfikiwzb3dclbqkc7e6xgjdt5jin4pia",
25902586
"git_aa": "bciqfl5s36w335ducrb6f6gwb3vuwup7vzqwwg67pq42xtkngsnxqobi",
25912587
"curl_aa": "bciqcfe7qyxmokpn6pgtaj35r5qg74jkehuu6cvyrtcsnegvwlm64oqy",
@@ -2595,7 +2591,7 @@
25952591
"cargo_binstall_ghrel": "bciqjqdb7r5cb2sw3fqycejnust3qj7d25cp2vorjwzxflyhiep5emvq",
25962592
"cpy_bs_ghrel": "bciqj3vfijdfrge4d4a3hsr4b6modlawbqxs2afumnn7gbwlpw7h27by",
25972593
"node_org": "bciqh6bgf5wilgx4scvhjo7hvvmlmimlqxl3ow5vqjghmo6qgo7bwzha",
2598-
"rust_rustup": "bciqbmz6w55lwziebnxjhyaji6aevp3dfsvpi3hf43pbdcexzufb2ggy"
2594+
"rust_rustup": "bciqjcspss2h46mtoacw7amxxnidegz42l2z3xccz6wdkbvmbq5ejnei"
25992595
},
26002596
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y": {
26012597
"version": "v28.2",

‎src/typegate_api/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ name = "typegate_api"
33
version.workspace = true
44
edition.workspace = true
55

6+
# this allows us to exclude the rust files
7+
# from the dockerfile while keeping the Cargo.toml
8+
# for cargo chef. Useful to improve cache hit in docker
9+
[lib]
10+
path = "src/lib.rs"
11+
612
[dependencies]
713
tg_schema.workspace = true
814
anyhow.workspace = true

‎src/typegraph/core/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ name = "typegraph_core"
33
version = "0.5.1-rc.4"
44
edition = "2021"
55

6+
# this allows us to exclude the rust files
7+
# from the dockerfile while keeping the Cargo.toml
8+
# for cargo chef. Useful to improve cache hit in docker
9+
[lib]
10+
path = "src/lib.rs"
11+
612
[dependencies]
713
# common.workspace = true
814
tg_schema.workspace = true

‎src/typegraph/graph/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ name = "typegraph"
33
version.workspace = true
44
edition.workspace = true
55

6+
# this allows us to exclude the rust files
7+
# from the dockerfile while keeping the Cargo.toml
8+
# for cargo chef. Useful to improve cache hit in docker
9+
[lib]
10+
path = "src/lib.rs"
11+
612
[dependencies]
713
tg_schema.workspace = true
814
serde.workspace = true

‎tests/runtimes/wasm_reflected/rust/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version.workspace = true
44
edition.workspace = true
55

66
[lib]
7+
path = "src/lib.rs"
78
crate-type = ["cdylib"]
89

910
[dependencies]

‎tools/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,15 @@ RUN curl -fsSL https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/
5757
| GHJK_INSTALL_EXE_DIR=/usr/bin VERSION=$GHJK_VERSION sh
5858

5959
COPY tools/ tools/
60-
COPY ghjk.ts .
60+
COPY ghjk.ts import_map.json .
61+
RUN mkdir .ghjk && cat <<EOF > .ghjk/deno.jsonc
62+
{
63+
"importMap": "../import_map.json",
64+
}
65+
EOF
6166
ENV GHJK_ENV=oci
6267
ENV GHJK_ACTIVATE=.ghjk/envs/$GHJK_ENV/activate.sh
63-
RUN ghjk envs cook
68+
RUN GHJK_LOG=debug ghjk envs cook
6469

6570
SHELL ["/bin/sh", "-c", ". ${GHJK_ACTIVATE} && sh -c \"$*\"", "sh"]
6671

‎tools/Dockerfile.dockerignore

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,30 @@
44
!tools/tasks/
55
!tools/LICENSE-MPL-2.0.md
66

7-
!src/common
7+
!examples/typegraphs/metagen/rs/Cargo.toml
8+
!tests/metagen/typegraphs/identities/rs/Cargo.toml
9+
!tests/metagen/typegraphs/sample/rs/Cargo.toml
10+
!tests/metagen/typegraphs/sample/rs_upload/Cargo.toml
11+
!tests/runtimes/wasm_reflected/rust/Cargo.toml
12+
!tests/runtimes/wasm_wire/rust/Cargo.toml
813
!src/meta-cli/Cargo.toml
914
!src/metagen/Cargo.toml
10-
!src/metagen/src/fdk_rust/static/Cargo.toml
15+
!src/typegate_api/Cargo.toml
16+
!src/metagen/src/fdk_rs/static/Cargo.toml
1117
!src/metagen-client-rs/Cargo.toml
1218
!src/metagen/src/client_rs/static/Cargo.toml
19+
!src/typegraph/core/Cargo.toml
20+
!src/typegraph/graph/Cargo.toml
21+
!src/xtask/Cargo.toml
22+
1323
!src/mt_deno
1424
!src/pyrt_wit_wire
1525
!src/substantial/
1626
!src/typegate/
17-
!src/typegraph/core/
27+
!src/typegraph/schema/
28+
!src/utils/archive/
29+
!src/utils/grpc/
1830
!src/wit/
19-
!src/xtask/Cargo.toml
2031

2132
!examples/deno.jsonc
2233
!src/typegraph/deno/deno.json
@@ -28,5 +39,6 @@
2839
!import_map.json
2940

3041
!ghjk.ts
42+
!.ghjk/lock.json
3143
!Cargo.toml
3244
!Cargo.lock

‎tools/cross.Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ RUN curl -fsSL https://raw.githubusercontent.com/metatypedev/ghjk/$GHJK_VERSION/
4343
WORKDIR /app
4444

4545
COPY tools/ tools/
46-
COPY ghjk.ts .
46+
COPY ghjk.ts import_map.json .
47+
RUN mkdir .ghjk && cat <<EOF > .ghjk/deno.jsonc
48+
{
49+
"importMap": "../import_map.json",
50+
}
51+
EOF
4752
# we don't use the oci env since mold breaks builds for aarch64 linux
4853
ENV GHJK_ENV=_rust
4954
RUN ghjk envs cook

‎tools/installs.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ export default {
99
// for use by pipi based ports
1010
python_latest: ports.cpy_bs({ version: "3.12.5", releaseTag: "20240814" }),
1111
node: ports.node({ version: "20.8.0" }),
12+
rustup: ports.rustup({ version: "1.28.2" }),
1213
rust_stable: ports.rust({
1314
version: RUST_VERSION,
1415
profile: "default",
1516
components: ["rust-src"],
16-
targets: ["wasm32-unknown-unknown", "wasm32-wasip1"],
17+
// FIXME: targets support is broken
18+
// targets: ["wasm32-unknown-unknown", "wasm32-wasip1"],
1719
}),
1820
rust_nightly: ports.rust({ version: "nightly-2024-05-26" }),
1921
deno: ports.deno_ghrel({ version: DENO_VERSION }),

0 commit comments

Comments
 (0)