Merge pull request #17 from infosiftr/go-dockerlibrary

Merge github.com/docker-library/go-dockerlibrary into bashbrew

Author: tianon

.dockerignore

@@ -1,6 +1,9 @@
 **
+!architecture/
 !bashbrew.sh
 !cmd/
 !go.mod
 !go.sum
+!manifest/
+!pkg/
 !scripts/

.github/workflows/ci.yml

@@ -27,6 +27,14 @@ jobs:
           bin/bashbrew list --uniq "$image"
           bin/bashbrew cat "$image"
           bin/bashbrew from --uniq "$image"
+  go-test:
+    name: Go Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Go Test
+        run: |
+          docker build --pull --file Dockerfile.test .
   dockerfile:
     name: Test Dockerfile
     runs-on: ubuntu-latest

Dockerfile

@@ -14,8 +14,7 @@ WORKDIR /usr/src/bashbrew
 COPY go.mod go.sum ./
 RUN go mod download; go mod verify
 
-COPY bashbrew.sh ./
-COPY cmd cmd
+COPY . .
 RUN export CGO_ENABLED=0; \
 	bash -x ./bashbrew.sh --version; \
 	rm -r ~/.cache/go-build; \

Dockerfile.test

@@ -0,0 +1,14 @@
+FROM golang:1.13-buster
+
+SHELL ["bash", "-Eeuo", "pipefail", "-xc"]
+
+WORKDIR /usr/src/bashbrew
+
+COPY go.mod go.sum ./
+RUN go mod download; go mod verify
+
+COPY . .
+
+RUN go test -v -race -coverprofile=coverage.out ./...
+
+RUN go tool cover -func=coverage.out

architecture/oci-platform.go

@@ -0,0 +1,26 @@
+package architecture
+
+// https://github.com/opencontainers/image-spec/blob/v1.0.1/image-index.md#image-index-property-descriptions
+// see "platform" (under "manifests")
+type OCIPlatform struct {
+	OS           string `json:"os"`
+	Architecture string `json:"architecture"`
+	Variant      string `json:"variant,omitempty"`
+
+	//OSVersion  string   `json:"os.version,omitempty"`
+	//OSFeatures []string `json:"os.features,omitempty"`
+}
+
+var SupportedArches = map[string]OCIPlatform{
+	"amd64":    {OS: "linux", Architecture: "amd64"},
+	"arm32v5":  {OS: "linux", Architecture: "arm", Variant: "v5"},
+	"arm32v6":  {OS: "linux", Architecture: "arm", Variant: "v6"},
+	"arm32v7":  {OS: "linux", Architecture: "arm", Variant: "v7"},
+	"arm64v8":  {OS: "linux", Architecture: "arm64", Variant: "v8"},
+	"i386":     {OS: "linux", Architecture: "386"},
+	"mips64le": {OS: "linux", Architecture: "mips64le"},
+	"ppc64le":  {OS: "linux", Architecture: "ppc64le"},
+	"s390x":    {OS: "linux", Architecture: "s390x"},
+
+	"windows-amd64": {OS: "windows", Architecture: "amd64"},
+}

cmd/bashbrew/cmd-cat.go

@@ -8,8 +8,8 @@ import (
 	"text/template"
 
 	"github.com/codegangsta/cli"
-	"github.com/docker-library/go-dockerlibrary/manifest"
-	"github.com/docker-library/go-dockerlibrary/pkg/templatelib"
+	"github.com/docker-library/bashbrew/manifest"
+	"github.com/docker-library/bashbrew/pkg/templatelib"
 )
 
 var DefaultCatFormat = `

cmd/bashbrew/cmd-deps.go

@@ -8,7 +8,7 @@ import (
 	"github.com/codegangsta/cli"
 	"pault.ag/go/topsort"
 
-	"github.com/docker-library/go-dockerlibrary/manifest"
+	"github.com/docker-library/bashbrew/manifest"
 )
 
 func cmdOffspring(c *cli.Context) error {

cmd/bashbrew/cmd-list.go

@@ -5,7 +5,7 @@ import (
 	"path"
 
 	"github.com/codegangsta/cli"
-	"github.com/docker-library/go-dockerlibrary/manifest"
+	"github.com/docker-library/bashbrew/manifest"
 )
 
 func cmdList(c *cli.Context) error {

cmd/bashbrew/cmd-put-shared.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/codegangsta/cli"
 
-	"github.com/docker-library/go-dockerlibrary/architecture"
-	"github.com/docker-library/go-dockerlibrary/manifest"
+	"github.com/docker-library/bashbrew/architecture"
+	"github.com/docker-library/bashbrew/manifest"
 )
 
 func entriesToManifestToolYaml(singleArch bool, r Repo, entries ...*manifest.Manifest2822Entry) (string, time.Time, int, error) {

cmd/bashbrew/config.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/codegangsta/cli"
-	"github.com/docker-library/go-dockerlibrary/pkg/stripper"
+	"github.com/docker-library/bashbrew/pkg/stripper"
 	"pault.ag/go/debian/control"
 )