From d9b60e7fc9ba5eb7081f635c4ba8e3df473d64a8 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 1 Dec 2016 21:47:53 +0100 Subject: [PATCH] Revert "Dockerfile: remove inline comments" This reverts commit 3dcdb1ff7d2360419c29c24e4032b7852aee3c26. Signed-off-by: Antonio Murdaca --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 81d52810..1040ee1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ FROM fedora RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-go-md2man \ + # gpgme bindings deps libassuan-devel gpgme-devel \ gnupg \ + # registry v1 deps xz-devel \ python-devel \ python-pip \ @@ -29,6 +31,7 @@ RUN set -x \ && rm -rf "$GOPATH" \ && export DRV1="$(mktemp -d)" \ && git clone https://github.com/docker/docker-registry.git "$DRV1" \ + # no need for setuptools since we have a version conflict with fedora && sed -i.bak s/setuptools==5.8//g "$DRV1/requirements/main.txt" \ && sed -i.bak s/setuptools==5.8//g "$DRV1/depends/docker-registry-core/requirements/main.txt" \ && pip install "$DRV1/depends/docker-registry-core" \