From b7bf15bc8b2ea9f1fc0b7f74b163ccf6e0faf03f Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 23 Feb 2021 14:38:20 -0500
Subject: [PATCH] Dockerfile.build: switch to fedora:latest

CopySuite.TestCopySignatures: Use quay.io instead of docker.io.

Resolves: gh#174

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 Dockerfile.build                 | 13 ++++++++-----
 integration/copy_test.go         |  2 +-
 integration/fixtures/policy.json |  5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.build b/Dockerfile.build
index d19d107e..2aad56f2 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,9 +1,12 @@
-FROM golang:1.14-buster
+FROM registry.fedoraproject.org/fedora:33
 
-RUN apt-get update && \
-    apt-get install -y \
-        libdevmapper-dev \
-        libgpgme11-dev
+RUN dnf update -y && \
+        dnf install -y \
+        btrfs-progs-devel \
+        device-mapper-devel \
+        golang \
+        gpgme-devel \
+        make
 
 ENV GOPATH=/
 WORKDIR /src/github.com/containers/skopeo
diff --git a/integration/copy_test.go b/integration/copy_test.go
index dbe88d97..b86b3289 100644
--- a/integration/copy_test.go
+++ b/integration/copy_test.go
@@ -802,7 +802,7 @@ func (s *CopySuite) TestCopySignatures(c *check.C) {
 		"--policy", policy, "copy", "docker://busybox:latest", dirDest)
 
 	// type: insecureAcceptAnything
-	assertSkopeoSucceeds(c, "", "--policy", policy, "copy", "docker://openshift/hello-openshift", dirDest)
+	assertSkopeoSucceeds(c, "", "--policy", policy, "copy", "docker://quay.io/openshift/origin-hello-openshift", dirDest)
 
 	// type: signedBy
 	// Sign the images
diff --git a/integration/fixtures/policy.json b/integration/fixtures/policy.json
index dba1043e..eb225649 100644
--- a/integration/fixtures/policy.json
+++ b/integration/fixtures/policy.json
@@ -50,6 +50,11 @@
                 {
                     "type": "insecureAcceptAnything"
                 }
+            ],
+            "quay.io/openshift": [
+                {
+                    "type": "insecureAcceptAnything"
+                }
             ]
         },
         "dir": {