Merge pull request #2 from rapidfort/v1.0.10

Add context sub path support

Author: rajeevt-rf

README.md

@@ -2250,7 +2250,12 @@ A: Smithy uses user namespaces for true rootless operation, while Kaniko runs as
 
 A: Yes! Smithy can run as a standard container:
 ```bash
-docker run --security-opt seccomp=unconfined --user 1000:1000 \
+docker run \
+  --cap-drop ALL \
+  --cap-add SETUID \
+  --cap-add SETGID \
+  --security-opt seccomp=unconfined \
+  --security-opt apparmor=unconfined \
   -v $(pwd):/workspace \
   ghcr.io/rapidfort/smithy:latest \
   --context=/workspace --destination=registry/image:tag
@@ -2321,37 +2326,6 @@ initContainers:
   securityContext:
     runAsUser: 0
 ```
-
----
-
-## License
-
-Smithy is licensed under the [MIT License](LICENSE).
-
-```
-MIT License
-
-Copyright (c) 2025 RapidFort Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ---
 
 ## Acknowledgments

src/cmd/smithy/args.go

@@ -61,6 +61,13 @@ func parseArgs(args []string) *Config {
 				config.Context = args[i]
 			}
 
+		case "--context-sub-path":
+			if value != "" {
+				config.SubContext = value
+			} else if i+1 < len(args) {
+				i++
+				config.SubContext = args[i]
+			}
 		case "-d", "--destination":
 			dest := value
 			if dest == "" && i+1 < len(args) {

src/cmd/smithy/config.go

@@ -5,6 +5,7 @@ type Config struct {
 	// Core build arguments
 	Dockerfile  string
 	Context     string
+	SubContext  string
 	Destination []string
 
 	// Cache configuration

src/cmd/smithy/help.go

@@ -13,6 +13,7 @@ func printHelp() {
 	fmt.Println()
 	fmt.Println("CORE OPTIONS:")
 	fmt.Println("  -c, --context PATH                    Build context directory or Git URL")
+	fmt.Println("  --context-sub-path PATH               Sub-directory within build context")
 	fmt.Println("  -f, --dockerfile PATH                 Path to Dockerfile (default: Dockerfile)")
 	fmt.Println("  -d, --destination IMAGE               Destination image with tag (repeatable)")
 	fmt.Println("  -t, --target STAGE                    Target stage in multi-stage Dockerfile")
@@ -61,6 +62,12 @@ func printHelp() {
 	fmt.Println("         --git-branch=main \\")
 	fmt.Println("         --destination=registry.io/myapp:v1.0.0")
 	fmt.Println()
+	fmt.Println("  # Build from sub-directory in Git repository")
+	fmt.Println("  smithy --context=https://github.com/org/repo.git \\")
+	fmt.Println("         --context-sub-path=docker/app \\")
+	fmt.Println("         --dockerfile=Dockerfile \\")
+	fmt.Println("         --destination=registry.io/myapp:latest")
+	fmt.Println()
 	fmt.Println("  # Build with custom arguments and labels")
 	fmt.Println("  smithy --context=. \\")
 	fmt.Println("         --destination=registry.io/myapp:latest \\")

src/cmd/smithy/main.go

@@ -102,8 +102,25 @@ func main() {
 	if err != nil {
 		logger.Fatal("Failed to prepare build context: %v", err)
 	}
+
 	defer ctx.Cleanup()
 
+	if config.SubContext != "" {
+		logger.Debug("Applying sub-context path: %s", config.SubContext)
+
+		// Join the sub-path to the prepared context
+		newContextPath := filepath.Join(ctx.Path, config.SubContext)
+
+		// Verify the sub-context exists
+		if _, err := os.Stat(newContextPath); os.IsNotExist(err) {
+			logger.Fatal("Sub-context path does not exist: %s (full path: %s)", config.SubContext, newContextPath)
+		}
+
+		// Update the context path
+		ctx.Path = newContextPath
+		logger.Info("Using sub-context: %s", ctx.Path)
+	}
+
 	// Execute build
 	buildConfig := build.Config{
 		Dockerfile:                 config.Dockerfile,