Remove local julia env (#38)

* Use `askem-julia`

* Use latest

* Fix references in Docker

* Update README

* Change 'Subkernel' -> 'subkernel'

* Remove unnecessary lines from Dockerfile

* Consolidate redundant copies

* Remove unnecessary chowns

Dockerfile

@@ -1,5 +1,4 @@
-ARG JULIA_IMAGE=askem-julia-base
-FROM ${JULIA_IMAGE} AS JULIA_BASE_IMAGE
+FROM ghcr.io/darpa-askem/askem-julia:latest AS JULIA_BASE_IMAGE
 
 
 FROM python:3.10
@@ -9,15 +8,13 @@ RUN mkdir -p /usr/local/share/jupyter/kernels && chmod -R 777 /usr/local/share/j
 
 ENV JULIA_PATH=/usr/local/julia
 ENV JULIA_DEPOT_PATH=/usr/local/julia
-ENV JULIA_PROJECT=/home/jupyter/.julia/environments/v1.9
+ENV JULIA_PROJECT=/home/jupyter/.julia/environments/askem
 
-COPY --from=JULIA_BASE_IMAGE /usr/local/julia /usr/local/julia
-COPY --from=JULIA_BASE_IMAGE /ASKEM-Sysimage.so /usr/local/julia/lib/ASKEM-Sysimage.so
+COPY --chown=1000:1000 --from=JULIA_BASE_IMAGE /usr/local/julia /usr/local/julia
+COPY --chown=1000:1000 --from=JULIA_BASE_IMAGE /ASKEM-Sysimage.so /Project.toml /Manifest.toml /home/jupyter/.julia/environments/askem/
 RUN chmod -R 777 /usr/local/julia/logs
 RUN ln -sf /usr/local/julia/bin/julia /usr/local/bin/julia
 
-COPY --chown=1000:1000 environments/julia /home/jupyter/.julia/environments/v1.9
-
 WORKDIR /home/jupyter
 
 # Install r-lang and kernel
@@ -58,7 +55,7 @@ COPY --chown=1000:1000 . /jupyter
 USER jupyter
 
 # Install Julia kernel
-RUN /usr/local/julia/bin/julia -J /usr/local/julia/lib/ASKEM-Sysimage.so -e 'using IJulia; IJulia.installkernel("julia"; julia=`/usr/local/julia/bin/julia -J /usr/local/julia/lib/ASKEM-Sysimage.so --threads=4`)'
+RUN /usr/local/julia/bin/julia -J /home/jupyter/.julia/environments/askem/ASKEM-Sysimage.so -e 'using IJulia; IJulia.installkernel("julia"; julia=`/usr/local/julia/bin/julia -J /home/jupyter/.julia/environments/askem/ASKEM-Sysimage.so --threads=4`)'
 
 # Service
 CMD ["python", "service/main.py", "--ip", "0.0.0.0"]

README.md

@@ -67,6 +67,11 @@ $ make dev
 
 This will start the Jupyter service and launch a specialized notebook interface in your browser similar to if you ran `$ jupyter notebook` normally.
 
+## Julia Subkernel Packages
+
+The Julia subkernel is managed by [`askem-julia`](https://github.com/DARPA-ASKEM/askem-julia). To make a new package
+available to Beaker, it must be added to `askem-julia`'s `Project.toml`.
+
 
 ## Differences from vanilla Jupyter
 

docker-bake.hcl

@@ -33,7 +33,7 @@ function "check_suffix" {
 # ----------------------------------------------------------------------------------------------------------------------
 
 group "prod" {
-  targets = ["beaker-kernel", "askem-julia-base"]
+  targets = ["beaker-kernel"]
 }
 
 group "default" {
@@ -46,23 +46,10 @@ target "_platforms" {
   platforms = ["linux/amd64"]
 }
 
-target "askem-julia-base" {
-    inherits = ["_platforms"]
-	context = "environments/julia/"
-	tags = tag("askem-julia-base", "", "")
-	dockerfile = "Dockerfile"
-}
-
 target "beaker-kernel-base" {
-    contexts = {
-        askem-julia-base = "target:askem-julia-base"
-    }
 	context = "."
 	tags = tag("beaker-kernel", "", "")
 	dockerfile = "Dockerfile"
-    args = {
-        JULIA_IMAGE = "askem-julia-base"
-    }
 }
 
 target "beaker-kernel" {

docker-compose.yaml

@@ -3,12 +3,6 @@
 
 version: '3'
 services:
-  julia-base-image:
-    image: askem-julia-base:build
-    build:
-      context: environments/julia
-    command: ["/bin/true"]
-
   jupyter:
     build:
       dockerfile: Dockerfile
@@ -27,8 +21,6 @@ services:
     volumes:
       - ./beaker_kernel:/usr/local/share/jupyter/kernels/beaker_kernel
       - .:/jupyter
-    depends_on:
-      - julia-base-image
     command:  ["python", "service/dev.py", "--ip", "0.0.0.0", "-y"]
 
   data-service: