File tree 7 files changed +62
-8
lines changed
7 files changed +62
-8
lines changed Original file line number Diff line number Diff line change @@ -190,7 +190,7 @@ jobs:
190
190
packages : write
191
191
strategy :
192
192
matrix :
193
- version : ["1.37-dev "]
193
+ version : ["1.37"]
194
194
env :
195
195
VERSION : ${{ matrix.version }}
196
196
BUILD_URL : https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
Original file line number Diff line number Diff line change 6
6
.Rprofile
7
7
apt-install
8
8
Aptfile
9
+ deps.ts
9
10
environment.txt
10
11
git_credential_helper.py
11
12
git-wrapper.sh
@@ -40,10 +41,13 @@ run.sh
40
41
41
42
! python /base-gpu /initial-condarc
42
43
44
+ ! deno /packages /deps.ts
45
+
43
46
! python /base /requirements.in
44
47
! python /datascience /requirements.in
45
48
! python /noteable /requirements.in
46
49
50
+ ! deno /packages /run.sh
47
51
! python /run.sh
48
52
! python /base-gpu /run.sh
49
53
! r /run.sh
Original file line number Diff line number Diff line change 1
1
version : 3
2
2
3
3
vars :
4
- NBL_DENO_VERSION : 1.37-dev
4
+ NBL_DENO_VERSION : 1.37
5
5
IDENTIFIER : base
6
6
7
7
# NOTE: When using `deps: []`, variables are inherited from the current task, but when calling them
@@ -21,9 +21,20 @@ tasks:
21
21
cmds :
22
22
- task copy-root-files LANGUAGE=deno IDENTIFIER={{.IDENTIFIER}} NBL_LANGUAGE_VERSION={{.NBL_DENO_VERSION}}
23
23
- task copy-language-files LANGUAGE=deno IDENTIFIER={{.IDENTIFIER}} NBL_LANGUAGE_VERSION={{.NBL_DENO_VERSION}}
24
+ - cp deno/packages/deps.ts deno/packages/{{.NBL_DENO_VERSION}}/deps.ts
24
25
25
26
base:build :
26
27
desc : Build the Deno base image after copying required files
27
28
cmds :
28
29
- task deno:base:copy-files IDENTIFIER=base NBL_LANGUAGE_VERSION={{.NBL_DENO_VERSION}}
29
30
- task deno:core:build IDENTIFIER=base NBL_DENO_VERSION={{.NBL_DENO_VERSION}}
31
+
32
+ packages:build :
33
+ desc : Build the Deno 1.3x image with commonly-installed packages
34
+ cmds :
35
+ # ensure the base image is built first
36
+ - task deno:base:build IDENTIFIER=packages NBL_DENO_VERSION={{.NBL_DENO_VERSION}}
37
+ # copy adjusted lockfile
38
+ - cp deno/packages/deps.ts deno/packages/{{.NBL_DENO_VERSION}}/deps.ts
39
+ # build the packages image off of the base image
40
+ - task build LANGUAGE=deno NBL_LANGUAGE_VERSION={{.NBL_DENO_VERSION}} IDENTIFIER=packages BUILD_TARGET=main -- --build-context base=docker-image://local/kernel-deno-{{.NBL_DENO_VERSION}}-base:dev
File renamed without changes.
Original file line number Diff line number Diff line change
1
+ # syntax = docker/dockerfile:1.5
2
+ # Packages build: imports/caches commonly-installed packages to ease load time
3
+ # hadolint ignore=DL3006
4
+ FROM base as main
5
+
6
+ USER noteable
7
+
8
+ # Copy and cache our desired imports
9
+ COPY ./deps.ts /tmp/deps.ts
10
+ RUN deno cache /tmp/deps.ts
Original file line number Diff line number Diff line change
1
+ import "https://deno.land/std/assert/mod.ts" ;
2
+ import "https://deno.land/x/[email protected] /mod.ts" ;
3
+ import "https://deno.land/x/deno_dom/deno-dom-wasm-noinit.ts" ;
4
+ import "https://deno.land/x/display/mod.ts" ;
5
+ import "https://deno.land/x/skia_canvas/mod.ts" ;
6
+
7
+ import "https://esm.sh/jsdom" ;
8
+ import "https://esm.sh/twind" ;
9
+
10
+ import "npm:apache-arrow" ;
11
+ import "npm:d3" ;
12
+ import "npm:express" ;
13
+ import "npm:nodejs-polars" ;
14
+ import "npm:react" ;
15
+ import "npm:vega-lite-api" ;
Original file line number Diff line number Diff line change @@ -30,14 +30,15 @@ variable "TIMESTAMP" {
30
30
# Group of Deno targets
31
31
group "deno" {
32
32
targets = [
33
- " deno_1_37-dev " ,
33
+ " deno_1_37" ,
34
34
]
35
35
}
36
36
37
37
# Group of Deno 1.37 targets
38
- group "deno_1_37-dev " {
38
+ group "deno_1_37" {
39
39
targets = [
40
- " deno_base_1_37-dev" ,
40
+ " deno_base_1_37" ,
41
+ " deno_packages_1_37" ,
41
42
]
42
43
}
43
44
@@ -399,12 +400,25 @@ target "rust_base_1_70_0" {
399
400
]
400
401
}
401
402
402
- # Base Deno 1.37-dev image
403
- target "deno_base_1_37-dev " {
403
+ # Base Deno 1.37 image
404
+ target "deno_base_1_37" {
404
405
inherits = [" base" ]
405
- context = " deno/base/1.37-dev "
406
+ context = " deno/base/1.37"
406
407
tags = [
407
408
" ghcr.io/noteable-io/kernel-deno-1.37-base:${ TAG } " ,
408
409
notequal (" " , HANDLE) ? " ghcr.io/noteable-io/kernel-deno-1.37-base:${ HANDLE } " : " "
409
410
]
410
411
}
412
+
413
+ # Deno 1.37 packages variant
414
+ target "deno_packages_1_37" {
415
+ context = " deno/packages/1.37"
416
+ contexts = {
417
+ base = " target:deno_base_1_37"
418
+ }
419
+ target = " main"
420
+ tags = [
421
+ " ghcr.io/noteable-io/kernel-deno-1.37-packages:${ TAG } " ,
422
+ notequal (" " , HANDLE) ? " ghcr.io/noteable-io/kernel-deno-1.37-packages:${ HANDLE } " : " "
423
+ ]
424
+ }
You can’t perform that action at this time.
0 commit comments