Add a feature to run existing, but stopped containers

.travis.yml

@@ -4,6 +4,7 @@ sudo: false
 
 go:
   - 1.9.x
+  - 1.10.x
 
 script:
   - make test-coverage

Dockerfile

@@ -1,12 +1,19 @@
-FROM golang:1.7
-MAINTAINER Máximo Cuadros <mcuadros@gmail.com>
+FROM golang:1.10.0 AS builder
 
-ADD . ${GOPATH}/src/github.com/mcuadros/ofelia
 WORKDIR ${GOPATH}/src/github.com/mcuadros/ofelia
+COPY . ${GOPATH}/src/github.com/mcuadros/ofelia
 
-RUN go get -v ./... \
- && go install -v ./... \
- && rm -rf $GOPATH/src/
+ENV CGO_ENABLED 0
+ENV GOOS linux
+
+RUN go get -v ./...
+RUN go build -a -installsuffix cgo -ldflags '-w  -extldflags "-static"' -o /go/bin/ofelia .
+
+FROM scratch
+
+COPY --from=builder /go/bin/ofelia /usr/bin/ofelia
 
 VOLUME /etc/ofelia/
-CMD ["ofelia", "daemon", "--config", "/etc/ofelia/config.ini"]
+ENTRYPOINT ["/usr/bin/ofelia"]
+
+CMD ["daemon", "--config", "/etc/ofelia/config.ini"]

core/runjob.go

@@ -16,26 +16,36 @@ func init() {
 
 type RunJob struct {
 	BareJob
-	Client  *docker.Client `json:"-"`
-	User    string         `default:"root"`
-	TTY     bool           `default:"false"`
-	Delete  bool           `default:"true"`
-	Image   string
-	Network string
+	Client    *docker.Client `json:"-"`
+	User      string         `default:"root"`
+	TTY       bool           `default:"false"`
+	Delete    bool           `default:"true"`
+	Image     string
+	Network   string
+	Container string
 }
 
 func NewRunJob(c *docker.Client) *RunJob {
 	return &RunJob{Client: c}
 }
 
 func (j *RunJob) Run(ctx *Context) error {
-	if err := j.pullImage(); err != nil {
-		return err
-	}
+	var container *docker.Container
+	var err error
+	if j.Image != "" && j.Container == "" {
+		if err = j.pullImage(); err != nil {
+			return err
+		}
 
-	container, err := j.buildContainer()
-	if err != nil {
-		return err
+		container, err = j.buildContainer()
+		if err != nil {
+			return err
+		}
+	} else {
+		container, err = j.getContainer(j.Container)
+		if err != nil {
+			return err
+		}
 	}
 
 	if err := j.startContainer(ctx.Execution, container); err != nil {
@@ -46,7 +56,10 @@ func (j *RunJob) Run(ctx *Context) error {
 		return err
 	}
 
-	return j.deleteContainer(container.ID)
+	if j.Container == "" {
+		return j.deleteContainer(container.ID)
+	}
+	return nil
 }
 
 func (j *RunJob) pullImage() error {
@@ -98,6 +111,14 @@ func (j *RunJob) startContainer(e *Execution, c *docker.Container) error {
 	return j.Client.StartContainer(c.ID, &docker.HostConfig{})
 }
 
+func (j *RunJob) getContainer(id string) (*docker.Container, error) {
+	container, err := j.Client.InspectContainer(id)
+	if err != nil {
+		return nil, err
+	}
+	return container, nil
+}
+
 const (
 	watchDuration      = time.Millisecond * 100
 	maxProcessDuration = time.Hour * 24

test/run-job/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3"
+
+services:
+  ofelia:
+    build:
+      dockerfile: Dockerfile
+      context: ../../.
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./ofelia.ini:/etc/ofelia/config.ini
+
+  job:
+    image: hello-world

test/run-job/ofelia.ini

@@ -0,0 +1,3 @@
+[job-run"job"]
+schedule = "*/1 * * * *"
+container = ofelia_job_1