fixing some stuff

Author: progrium

Dockerfile

@@ -0,0 +1,8 @@
+# This is for dev/debugging. No intention of an entrykit base image...
+FROM alpine:3.2
+ADD ./build/Linux/entrykit /bin/entrykit
+RUN /bin/entrykit --symlink
+RUN echo -e "#!/bin/sh\nwhile true; do sleep 1; echo \$RANDOM \$1; done" > /bin/numbers \
+  && chmod +x /bin/numbers
+
+ENTRYPOINT ["codep", "-p", "alpha=/bin/numbers foo", "beta=/bin/numbers bar"]

Makefile

@@ -1,6 +1,6 @@
 NAME=entrykit
 ARCH=$(shell uname -m)
-VERSION=0.1.0
+VERSION=0.2.0
 
 .PHONY: build release
 

README.md

@@ -8,7 +8,7 @@ Entrypoint tools for elegant, programmable containers
  - Good for image authors. Eliminates helper/start scripts or depending on shells.
  - Can be good for image users. Allows users to program/extend containers.
 
-/bin/entrykit symlink
+/bin/entrykit --symlink
 
 -e allow environment as well
 -E allow environment prefixed with EK_

cmd/entrykit.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/progrium/entrykit"
@@ -13,12 +14,18 @@ import (
 	_ "github.com/progrium/entrykit/waitgrp"
 )
 
+var Version string
+
 func main() {
-	if len(os.Args) > 1 && os.Args[1] == "symlink" {
-		entrykit.Symlink()
-		return
+	if len(os.Args) > 1 {
+		switch os.Args[1] {
+		case "-v", "--version":
+			fmt.Println(Version)
+			os.Exit(0)
+		case "--symlink":
+			entrykit.Symlink()
+			os.Exit(0)
+		}
 	}
-	cmd := entrykit.RanAs()
-	entrykit.Cmds[cmd](
-		entrykit.NewConfig(cmd, true))
+	entrykit.RunCmd()
 }

config.go

@@ -29,15 +29,13 @@ func NewConfig(cmd string, exec bool) *Config {
 Loop:
 	for i, arg := range args {
 		switch arg {
-		case "-v", "--version":
-			fmt.Println(Version)
-			os.Exit(0)
 		case "-e":
 			useEnv = true
 		case "-E":
 			useEnv = true
 			namespaceEnv = true
 		case "-p":
+			println("warning: -p flag not implemented yet")
 			config.Prefix = true
 		case "-f":
 			configFile = args[i+1]

config_test.go

@@ -0,0 +1,7 @@
+package entrykit
+
+import "testing"
+
+func TestConfig(t *testing.T) {
+	// todo!
+}

entrykit.go

@@ -2,18 +2,18 @@ package entrykit
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"strings"
 	"syscall"
 
+	"github.com/kardianos/osext"
 	"github.com/mgood/go-posix"
 )
 
-var Version string
-
 var Cmds = make(map[string]func(config *Config))
 
 var runlist = []string{
@@ -26,10 +26,10 @@ var runlist = []string{
 }
 
 func init() {
-	Cmds[""] = Run
+	Cmds["entrykit"] = RunMulti
 }
 
-func Run(config *Config) {
+func RunMulti(config *Config) {
 	if len(config.Tasks) > 0 {
 		Error(fmt.Errorf("Entrykit cannot take tasks via arguments"))
 	}
@@ -89,20 +89,26 @@ func CommandTask(task string) *exec.Cmd {
 }
 
 func Symlink() {
+	binaryPath, err := osext.Executable()
+	if err != nil {
+		log.Fatal(err)
+	}
 	for name, _ := range Cmds {
-		os.Symlink(os.Args[0], filepath.Dir(os.Args[0])+"/"+name)
+		target := filepath.Dir(binaryPath) + "/" + name
+		fmt.Println("Creating symlink", target, "...")
+		os.Symlink(os.Args[0], target)
 	}
 }
 
-func RanAs() string {
+func RunCmd() {
 	cmdRun := filepath.Base(os.Args[0])
-	cmd := ""
+	cmd := "entrykit"
 	for name := range Cmds {
 		if name == cmdRun {
 			cmd = name
 		}
 	}
-	return cmd
+	Cmds[cmd](NewConfig(cmd, true))
 }
 
 func Error(err error) {