Revert "Remove unused dockerlib utility and manifests. (#455)"

This reverts commit 22dc7af.

Author: danxmoran

Jenkinsfile

@@ -0,0 +1,142 @@
+pipeline {
+  agent any
+  options { skipDefaultCheckout() }
+
+  environment {
+    DOCKER_MAINTAINER = credentials("INFLUXDATA_DOCKER_MAINTAINER")
+  }
+
+  stages {
+    stage('Setup project workspace') {
+      steps {
+        dir('influxdata-docker') {
+          checkout scm
+        }
+      }
+    }
+
+    stage('Build docker images') {
+      parallel {
+        stage('chronograf') {
+          steps {
+            dir('influxdata-docker') {
+              sh './circle-test.sh chronograf'
+            }
+          }
+        }
+
+        stage('influxdb') {
+          steps {
+            dir('influxdata-docker') {
+              sh './circle-test.sh influxdb'
+            }
+          }
+        }
+
+        stage('kapacitor') {
+          steps {
+            dir('influxdata-docker') {
+              sh './circle-test.sh kapacitor'
+            }
+          }
+        }
+
+        stage('telegraf') {
+          steps {
+            dir('influxdata-docker') {
+              sh './circle-test.sh telegraf'
+            }
+          }
+        }
+      }
+    }
+
+    stage('Update official images') {
+      steps {
+        dir('official-images') {
+          checkout(
+            scm: [
+              $class: 'GitSCM',
+              branches: [[name: '*/master' ]],
+              userRemoteConfigs: [[
+                credentialsId: 'jenkins-hercules-ssh',
+                url: '[email protected]:influxdata/official-images.git',
+              ]],
+            ],
+            poll: false,
+          )
+
+          // Reset master to the value at origin.
+          sh "git checkout master && git reset --hard origin/master"
+        }
+
+        dir('influxdata-docker') {
+          sh "docker build -t influxdata/dockerlib:build-${BUILD_NUMBER} dockerlib"
+        }
+
+        withDockerContainer(image: "influxdata/dockerlib:build-${BUILD_NUMBER}") {
+          sh "cd influxdata-docker; dockerlib update"
+        }
+      }
+
+      post {
+        always {
+          sh "docker rmi -f influxdata/dockerlib:build-${BUILD_NUMBER}"
+        }
+      }
+    }
+
+    stage('Push changes to GitHub') {
+      when {
+        expression {
+          return sh(returnStatus: true, script: 'cd official-images; git diff --quiet') != 0
+        }
+      }
+
+      steps {
+        dir('official-images') {
+          sshagent(credentials: ['jenkins-hercules-ssh']) {
+            sh """
+              git -c user.name="Jonathan A. Sternberg" -c user.email="[email protected]" commit -am "Update influxdata images"
+              git push origin master
+            """
+          }
+
+          sh """
+            desired_remote_url=git://github.com/docker-library/official-images.git
+            if current_remote_url=\$(git remote get-url upstream 2> /dev/null); then
+              if [ "\$current_remote_url" != "\$desired_remote_url" ]; then
+                git remote set-url upstream "\$desired_remote_url"
+              fi
+            else
+              git remote add upstream "\$desired_remote_url"
+            fi
+          """
+
+          sh "docker pull jsternberg/hub"
+          withEnv(["GITHUB_USER=${DOCKER_MAINTAINER_USR}", "GITHUB_TOKEN=${DOCKER_MAINTAINER_PSW}"]) {
+            withDockerContainer(image: "jsternberg/hub") {
+              sh """
+                if ! hub pr show; then
+                  hub pull-request -m "Update influxdata images"
+                fi
+              """
+            }
+          }
+        }
+      }
+    }
+  }
+
+  post {
+    changed {
+      script {
+        if ( currentBuild.currentResult == 'SUCCESS' ) {
+          slackSend(channel: '#docker-builds', color: '#00FF00', message: '@channel the docker build has returned back to normal.')
+        } else {
+          slackSend(channel: '#docker-builds', color: '#FF0000', message: '@channel the docker build has failed!')
+        }
+      }
+    }
+  }
+}

chronograf/manifest.json

@@ -0,0 +1,16 @@
+{
+  "name": "chronograf",
+  "maintainers": [
+    "Jonathan A. Sternberg <[email protected]> (@jsternberg)",
+    "Bucky Schwarz <[email protected]> (@hoorayimhelping)"
+  ],
+  "versions": ["1.6", "1.7", "1.8"],
+  "architectures": [
+    "amd64",
+    "arm32v7",
+    "arm64v8"
+  ],
+  "variants": [
+    {"name": "alpine"}
+  ]
+}

dockerlib/Dockerfile

@@ -0,0 +1,9 @@
+FROM golang:1.9.2-stretch as builder
+COPY . /go/src/github.com/influxdata/influxdata-docker/dockerlib
+RUN set -xe && \
+    go get -d github.com/influxdata/influxdata-docker/dockerlib && \
+    go install github.com/influxdata/influxdata-docker/dockerlib
+
+FROM buildpack-deps:stretch-scm
+COPY --from=builder /go/bin/dockerlib /usr/bin/dockerlib
+ENTRYPOINT ["/usr/bin/dockerlib"]

dockerlib/commands.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"os"
+
+	"path/filepath"
+
+	"fmt"
+
+	"github.com/influxdata/influxdata-docker/dockerlib/dockerlib"
+	"github.com/spf13/cobra"
+)
+
+var RootCmd = &cobra.Command{
+	Use:   "dockerlib",
+	Short: "Manage docker official images",
+}
+
+var UpdateCmd = &cobra.Command{
+	Use:   "update",
+	Short: "Update the official-images repository",
+	Run: func(cmd *cobra.Command, args []string) {
+		if err := Update(); err != nil {
+			fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+			os.Exit(1)
+		}
+	},
+}
+
+func Update() error {
+	// Locate all of the manifests within this repository.
+	manifests, err := dockerlib.FindImageManifests()
+	if err != nil {
+		return err
+	}
+
+	for _, m := range manifests {
+		if len(m.Maintainers) == 0 {
+			m.Maintainers = getDefaultMaintainers()
+		}
+		header := dockerlib.Header{}
+		for _, maintainer := range m.Maintainers {
+			header.Add("Maintainers", maintainer)
+		}
+		header.Add("GitRepo", remoteRepo)
+
+		rev, err := latestRev(m.BaseDir)
+		if err != nil {
+			return err
+		}
+		header.Add("GitCommit", rev)
+
+		if err := func() error {
+			f, err := os.Create(filepath.Join("../official-images/library", m.Name))
+			if err != nil {
+				return err
+			}
+			defer f.Close()
+
+			if err := m.Write(f, &header); err != nil {
+				return err
+			}
+			return f.Close()
+		}(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func init() {
+	RootCmd.AddCommand(UpdateCmd)
+}

dockerlib/dockerlib/header.go

@@ -0,0 +1,78 @@
+package dockerlib
+
+import (
+	"container/list"
+	"fmt"
+	"io"
+	"strings"
+)
+
+type keyValuePair struct {
+	key    string
+	values []string
+}
+
+type Header struct {
+	values *list.List
+	index  map[string]*list.Element
+}
+
+func (h *Header) Add(key, value string) {
+	e, ok := h.index[key]
+	if !ok {
+		h.Set(key, value)
+		return
+	}
+
+	kv := e.Value.(*keyValuePair)
+	kv.values = append(kv.values, value)
+}
+
+func (h *Header) Set(key, value string) {
+	if h.index == nil {
+		h.index = make(map[string]*list.Element)
+	}
+	if h.values == nil {
+		h.values = list.New()
+	}
+	values := make([]string, 1)
+	values[0] = value
+	h.index[key] = h.values.PushBack(&keyValuePair{
+		key:    key,
+		values: values,
+	})
+}
+
+func (h *Header) Write(w io.Writer) error {
+	for front := h.values.Front(); front != nil; front = front.Next() {
+		kv := front.Value.(*keyValuePair)
+		if kv.key == "Maintainers" {
+			if err := h.writeMaintainers(w, kv.values); err != nil {
+				return err
+			}
+		} else if _, err := fmt.Fprintf(w, "%s: %s\n", kv.key, strings.Join(kv.values, ", ")); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (h *Header) writeMaintainers(w io.Writer, values []string) error {
+	if _, err := fmt.Fprint(w, "Maintainers: "); err != nil {
+		return err
+	}
+	for i, value := range values {
+		if _, err := fmt.Fprintf(w, "%s", value); err != nil {
+			return err
+		}
+		if i < len(values)-1 {
+			if _, err := fmt.Fprint(w, ",\n             "); err != nil {
+				return err
+			}
+		}
+	}
+	if _, err := fmt.Fprintln(w); err != nil {
+		return err
+	}
+	return nil
+}