Merge pull request #20027 from smarterclayton/layer

Add `oc image append` which adds layers to a schema1/2 image
openshift · Jul 13, 2018 · fec789b · fec789b
2 parents e689dd3 + 2721b3b
commit fec789b
Show file tree

Hide file tree

Showing 31 changed files with 2,143 additions and 778 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
diff --git a/docs/man/man1/.files_generated_oc b/docs/man/man1/.files_generated_oc
diff --git a/docs/man/man1/oc-image-append.1 b/docs/man/man1/oc-image-append.1
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -148,17 +148,25 @@
     ]
   },
 
+  {
+    "checkedPackages": [
+      "github.com/openshift/origin/pkg/image/apis/image/docker10"
+    ],
+    "allowedImportPackageRoots": [],
+    "allowedImportPackages": []
+  },
+
   {
     "checkedPackages": [
       "github.com/openshift/origin/pkg/image/apis/image",
-      "github.com/openshift/origin/pkg/image/apis/image/docker10",
       "github.com/openshift/origin/pkg/image/apis/image/dockerpre012",
       "github.com/openshift/origin/pkg/image/apis/image/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
       "github.com/openshift/origin/pkg/image/apis/image/internal",
       "github.com/openshift/origin/pkg/image/apis/image/reference",
+      "github.com/openshift/origin/pkg/image/apis/image/docker10",
       "vendor/k8s.io/api",
       "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
@@ -484,6 +492,10 @@
       "github.com/openshift/origin/pkg/image/apis/image",
       "github.com/openshift/origin/pkg/image/apis/image/install",
       "github.com/openshift/origin/pkg/image/apis/image/v1/trigger",
+      "github.com/openshift/origin/pkg/image/apis/image/docker10",
+      "github.com/openshift/origin/pkg/image/apis/image/reference",
+      "github.com/openshift/origin/pkg/image/dockerlayer",
+      "github.com/openshift/origin/pkg/image/dockerlayer/add",
       "github.com/openshift/origin/pkg/image/importer/dockerv1client",
       "github.com/openshift/origin/pkg/image/registryclient",
       "github.com/openshift/origin/pkg/image/registryclient/dockercredentials",

diff --git a/pkg/image/apis/image/docker10/conversion.go b/pkg/image/apis/image/docker10/conversion.go
@@ -0,0 +1,24 @@
+package docker10
+
+// Convert_DockerV1CompatibilityImage_to_DockerImageConfig takes a Docker registry digest
+// (schema 2.1) and converts it to the external API version of Image.
+func Convert_DockerV1CompatibilityImage_to_DockerImageConfig(in *DockerV1CompatibilityImage, out *DockerImageConfig) error {
+	*out = DockerImageConfig{
+		ID:              in.ID,
+		Parent:          in.Parent,
+		Comment:         in.Comment,
+		Created:         in.Created,
+		Container:       in.Container,
+		DockerVersion:   in.DockerVersion,
+		Author:          in.Author,
+		Architecture:    in.Architecture,
+		Size:            in.Size,
+		OS:              "linux",
+		ContainerConfig: in.ContainerConfig,
+	}
+	if in.Config != nil {
+		out.Config = &DockerConfig{}
+		*out.Config = *in.Config
+	}
+	return nil
+}
diff --git a/pkg/image/apis/image/docker10/doc.go b/pkg/image/apis/image/docker10/doc.go
@@ -1,2 +1,3 @@
-// Package docker10 is the docker10 version of the API.
+// Package docker10 provides types used by docker/distribution and moby/moby.
+// This package takes no dependency on external types.
 package docker10
diff --git a/pkg/image/apis/image/docker10/register.go b/pkg/image/apis/image/docker10/register.go