Remove Dockerfile and setup scripts; update devcontainer configuratio…

…n and workflows
trr266 · Dec 18, 2024 · 002ec04 · 002ec04
1 parent d9a0362
commit 002ec04
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 41 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,11 +1,13 @@
 {
-	"name": "Debian",
-// 	"build": {
-// 		"dockerfile": "Dockerfile",
-// 		"context": "..",
-// 	},
-// 	use image instead of rebuilding everytime
-	"image": "ghcr.io/trr266/esef-website:main",
+	"image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu-24.04",
+    "features": {
+        "ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {
+            "version": "release", "installTinyTex": false
+        },
+		"ghcr.io/julialang/devcontainer-features/julia": "1.11",
+		"ghcr.io/prulloac/devcontainer-features/latex:1": {},
+		"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {"packages": "librsvg2-bin,xdg-utils"}
+    },
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
 		"terminal.integrated.fontFamily": "monospace",
@@ -15,11 +17,12 @@
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"quarto.quarto",
-		"julialang.language-julia",
-		"GitHub.copilot"
+		"GitHub.copilot",
+		"ms-azuretools.vscode-docker",
+		"mathematic.vscode-pdf"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
-	// "onCreateCommand": "julia --project=docs startup_julia.jl"
+	// "onCreateCommand": "git clone https://github.com/jeremiahpslewis/diatypst.git && mkdir -p ~/.local/share/typst/packages/local/diatypst/1.0.0/ && ln -s /workspaces/demand-data-digital/diatypst ~/.local/share/typst/packages/local/diatypst/1.0.0/ && mkdir -p /home/vscode/typst/packages/local/diatypst/1.0.0/ && ln -s /workspaces/demand-data-digital/diatypst /home/vscode/typst/packages/local/diatypst/1.0.0/"
 }
diff --git a/.github/workflows/quarto.yml b/.github/workflows/quarto.yml
@@ -27,6 +27,14 @@ jobs:
       - 
         name: Checkout repository
         uses: actions/checkout@v4
+      - 
+        name: Pre-build image and run make ci-build in dev container
+        uses: devcontainers/ci@v0.3
+        with:
+          imageName: ghcr.io/trr266/esef-website:main
+          cacheFrom: ghcr.io/trr266/esef-website:main
+          push: always
+          runCmd: make ci-build        
       - 
         name: Render book to all formats  
         run: |

diff --git a/setup_julia.jl b/setup_julia.jl