Skip to content

Commit 3f89568

Browse files
authored
Merge branch 'master' into scoped-without-registry
2 parents d5001eb + 1a3ae14 commit 3f89568

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix:
99
- os: osx
1010

1111
go:
12-
- 1.13.x
12+
- 1.15.x
1313

1414
notifications:
1515
email: false

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-md2ma
1313
which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \
1414
bats jq podman runc \
1515
golint \
16+
openssl \
1617
&& dnf clean all
1718

1819
# Install two versions of the registry. The first is an older version that

integration/copy_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,10 +1114,12 @@ func (s *CopySuite) TestCopyVerifyingMirroredSignatures(c *check.C) {
11141114
// Create a signature for mirroring-primary:primary-signed without pushing there. This should be easier than using standalone-sign.
11151115
signingDir := filepath.Join(topDir, "signing-temp")
11161116
assertSkopeoSucceeds(c, "", "copy", "--src-tls-verify=false", regPrefix+"primary:unsigned", "dir:"+signingDir)
1117-
c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir))
1117+
// Unknown error in Travis: https://github.com/containers/skopeo/issues/1093
1118+
// c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir))
11181119
assertSkopeoSucceeds(c, "^$", "standalone-sign", "-o", filepath.Join(signingDir, "signature-1"),
11191120
filepath.Join(signingDir, "manifest.json"), "localhost:5006/myns/mirroring-primary:primary-signed", "[email protected]")
1120-
c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir))
1121+
// Unknown error in Travis: https://github.com/containers/skopeo/issues/1093
1122+
// c.Logf("%s", combinedOutputOfCommand(c, "ls", "-laR", signingDir))
11211123
assertSkopeoSucceeds(c, "", "--registries.d", registriesDir, "copy", "--dest-tls-verify=false", "dir:"+signingDir, regPrefix+"mirror:primary-signed")
11221124
// Verify that a correctly signed image for the primary is accessible using the primary's reference
11231125
assertSkopeoSucceeds(c, "", "--policy", policy, "--registries.d", registriesDir, "--registries-conf", "fixtures/registries.conf", "copy", "--src-tls-verify=false", regPrefix+"primary:primary-signed", dirDest)

0 commit comments

Comments
 (0)