Heph2/logs

Jockerfile

@@ -1,40 +1,40 @@
 #syntax=ghcr.io/jocker-org/jocker
 
-local std = import "std.libsonnet";
+// local std = import "std.libsonnet";
 
 {
   "stages": [
     {
       "name": "builder",
-      "from": "alpine:latest",
+      "from": "golang:alpine",
       "steps": [
-	std.stage.step.workdir("/src"),
-	// {"type": "WORKDIR", "path": "/src"},
+	// std.stage.step.workdir("/src"),
+	{"type": "WORKDIR", "path": "/src"},
         {"type": "RUN", "command": "apk update"},
         {"type": "RUN", "command": "apk upgrade"},
-        {"type": "RUN", "command": "apk add mkdocs"},
-        {"type": "COPY", "src": "mkdocs.yml", "dst": "/src"},
-        {"type": "COPY", "src": "./docs", "dst": "/src/docs"},
-        {"type": "RUN", "command": "mkdocs build"}
+        // {"type": "RUN", "command": "apk add mkdocs"},
+        // {"type": "COPY", "src": "mkdocs.yml", "dst": "/src"},
+        // {"type": "COPY", "src": "./docs", "dst": "/src/docs"},
+        // {"type": "RUN", "command": "mkdocs build"}
       ]
     },
-    {
-      "name": "server",
-      "from": "alpine:latest",
-      "steps": [
-	{"type": "RUN", "command": "addgroup -g 1000 app && adduser -G app -u 1000 app -D"},
-        {"type": "RUN", "command": "apk update"},
-        {"type": "RUN", "command": "apk upgrade"},
-        {"type": "RUN", "command": "apk add darkhttpd"},
-        {"type": "COPY", "from": "builder", "src": "/src/site", "dst": "/www"},
-	{"type": "USER", "user": "1000"},
-      ],
-    },
+    // {
+    //   "name": "server",
+    //   "from": "alpine:latest",
+    //   "steps": [
+    // 	{"type": "RUN", "command": "addgroup -g 1000 app && adduser -G app -u 1000 app -D"},
+    //     {"type": "RUN", "command": "apk update"},
+    //     {"type": "RUN", "command": "apk upgrade"},
+    //     {"type": "RUN", "command": "apk add darkhttpd"},
+    //     {"type": "COPY", "from": "builder", "src": "/src/site", "dst": "/www"},
+    // 	{"type": "USER", "user": "1000"},
+    //   ],
+    // },
   ],
-  "image": {
-    "Env": ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
-    "Cmd": ["darkhttpd", "/www"],
-  },
+  // "image": {
+  //   "Env": ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],
+  //   "Cmd": ["darkhttpd", "/www"],
+  // },
   "excludes" : ["*", "!docs", "!mkdocs.yml"],
 }
 

cmd/jocker/debug-dump.go

@@ -14,26 +14,22 @@ func DebugDump() error {
 	vm := jsonnet.MakeVM()
 	vm.Importer(&jsonnet.FileImporter{JPaths: []string{"/lib/"}})
 
-	// Initialize Jsonnet VM and evaluate Jockerfile
 	jsonStr, err := vm.EvaluateFile("Jockerfile")
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	// Parse JSON into Jockerfile struct
 	j, err := parser.ParseJockerfile(jsonStr)
 	if err != nil {
 		log.Fatal(err)
 	}
-
-	// Generate LLB state from Jockerfile
-	state := j.ToLLB()
 	ctx := context.TODO()
+	state := j.ToLLB("all", ctx, nil)
+
 	dt, err := state.Marshal(ctx, llb.LinuxAmd64)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	// Write LLB definition to stdout
 	return llb.WriteTo(dt, os.Stdout)
 }

flake.nix

@@ -3,36 +3,52 @@
 
   inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 
-  outputs = { self, nixpkgs }:
+  outputs =
+    { self, nixpkgs }:
     let
       goVersion = 22; # Change this to update the whole stack
 
-      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ self.overlays.default ];
-        };
-      });
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forEachSupportedSystem =
+        f:
+        nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            pkgs = import nixpkgs {
+              inherit system;
+              overlays = [ self.overlays.default ];
+            };
+          }
+        );
     in
     {
       overlays.default = final: prev: {
         go = final."go_1_${toString goVersion}";
       };
 
-      devShells = forEachSupportedSystem ({ pkgs }: {
-        default = pkgs.mkShell {
-          packages = with pkgs; [
-            # go (version is specified by overlay)
-            go
+      devShells = forEachSupportedSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              # go (version is specified by overlay)
+              go
 
-            # goimports, godoc, etc.
-            gotools gopls
+              buildkit
+              # goimports, godoc, etc.
+              gotools
+              gopls
 
-            # https://github.com/golangci/golangci-lint
-            golangci-lint
-          ];
-        };
-      });
+              # https://github.com/golangci/golangci-lint
+              golangci-lint
+            ];
+          };
+        }
+      );
     };
 }

internal/parser/builder.go

@@ -14,14 +14,20 @@ import (
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
 	"github.com/moby/buildkit/frontend/gateway/client"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/pkg/errors"
 )
 
 func readFile(ctx context.Context, c client.Client, filename string) (content []byte, err error) {
 	src := llb.Local("context",
-		llb.IncludePatterns([]string{filename}),
+		llb.IncludePatterns([]string{
+			filename,
+			"**/" + filename,
+			"*/",
+		}),
 		llb.SessionID(c.BuildOpts().SessionID),
 		llb.SharedKeyHint("Jockerfile"),
+		llb.WithCustomName("load " + filename),
+
 	)
 
 	def, err := src.Marshal(ctx)
@@ -60,15 +66,29 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 		}
 	}
 
+	jopts, err := json.Marshal(opts)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal opts: %w", err)
+	}
+
 	jbuildargs, err := json.Marshal(buildargs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal buildargs: %w", err)
 	}
 
 	vm := jsonnet.MakeVM()
 	vm.ExtCode("buildArgs", string(jbuildargs))
+	vm.ExtCode("filename", fmt.Sprintf("%q",filename))
+	vm.ExtCode("opts", fmt.Sprintf("%q",jopts))
 	vm.Importer(NewChainedImporter(NewContextImporter(ctx, c), []string{"/lib/"}))
-	jsonStr, err := vm.EvaluateFile(filename)
+
+	dtJockerfile, err := readFile(ctx, c, filename)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read Jockerfile")
+	}
+
+	// jsonStr, err := vm.EvaluateFile(filename)
+	jsonStr, err := vm.EvaluateAnonymousSnippet(filename, string(dtJockerfile))
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +104,8 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 			j.Excludes, _ = dockerignore.Parse(bytes.NewReader(content))
 		}
 	}
-	state := j.ToLLB()
+
+	state := j.ToLLB(buildargs["debug"], ctx, c)
 
 	dt, err := state.Marshal(ctx, llb.LinuxAmd64)
 	if err != nil {
@@ -96,7 +117,7 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 	})
 
 	if err != nil {
-		return nil, fmt.Errorf("failed to resolve dockerfile: %w", err)
+		return nil, fmt.Errorf("failed to resolve jockerfile: %w", err)
 	}
 
 	ref, err := res.SingleRef()
@@ -111,17 +132,15 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 				userplatform, err)
 		}
 	}
-	img := &specs.Image{
-		Platform: p,
-		Config:   j.Image,
-	}
 
-	config, err := json.Marshal(img)
+	j.Image.Platform = p
+
+	config, err := json.Marshal(j.Image)
 	if err != nil {
-		return nil, fmt.Errorf("failed to marshal image config: %w", err)
+		return nil, errors.Wrapf(err, "failed to marshal image config")
 	}
-	res.AddMeta(exptypes.ExporterImageConfigKey, config)
 	res.SetRef(ref)
+	res.AddMeta(exptypes.ExporterImageConfigKey, config)
 
 	return res, nil
 }

internal/parser/jockerfile.go

@@ -2,8 +2,8 @@ package parser
 
 import (
 	"encoding/json"
-
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
+	// specs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 type ArgStep struct {
@@ -37,7 +37,7 @@ type BuildStage struct {
 
 type Jockerfile struct {
 	Stages   []BuildStage      `json:"stages"`
-	Image    specs.ImageConfig `json:"image"`
+	Image    dockerspec.DockerOCIImage `json:image`
 	Excludes []string          `json:"excludes,omitempty"`
 }