Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

Change library used to encode manifest. #247

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ tests/*.docker

*.swp
*.aci

# Intellij files
*.iml
.idea
12 changes: 8 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ import:
- specs-go
- package: github.com/opencontainers/go-digest
version: 21dfd564fd89c944783d00d069f33e3e7123c448
- package: github.com/docker/go
version: d30aec9fd63c35133f8f79c3412ad91a3b08be06
subpackages:
- canonical/json
3 changes: 2 additions & 1 deletion lib/internal/internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/appc/spec/schema"
appctypes "github.com/appc/spec/schema/types"
gzip "github.com/klauspost/pgzip"
canJson "github.com/docker/go/canonical/json"
)

// Docker2ACIBackend is the interface that abstracts converting Docker layers
Expand Down Expand Up @@ -720,7 +721,7 @@ func subtractWhiteouts(pathWhitelist []string, whiteouts []string) []string {

// WriteManifest writes a schema.ImageManifest entry on a tar.Writer.
func WriteManifest(outputWriter *tar.Writer, manifest schema.ImageManifest) error {
b, err := json.Marshal(manifest)
b, err := canJson.Marshal(manifest)
if err != nil {
return err
}
Expand Down
27 changes: 27 additions & 0 deletions vendor/github.com/docker/go/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading