Merge pull request #1002 from snyk/fix/upgrades

Fix/upgrades

Author: ivanstanev

Dockerfile

@@ -3,12 +3,7 @@
 #---------------------------------------------------------------------
 FROM fedora:32 AS skopeo-build
 
-RUN dnf install -y golang git make
-RUN dnf install -y go-md2man gpgme-devel libassuan-devel btrfs-progs-devel device-mapper-devel
-RUN git clone --depth 1 -b 'v1.5.1' https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
-RUN cd $GOPATH/src/github.com/containers/skopeo \
-  && make bin/skopeo DISABLE_CGO=1 \
-  && make install
+RUN dnf install -y skopeo
 
 #---------------------------------------------------------------------
 # STAGE 2: Build credential helpers inside a temporary container
@@ -56,7 +51,7 @@ COPY --chown=snyk:snyk --from=cred-helpers-build /go/bin/docker-credential-acr-e
 
 WORKDIR /srv/app
 
-COPY --chown=snyk:snyk --from=skopeo-build /usr/local/bin/skopeo /usr/bin/skopeo
+COPY --chown=snyk:snyk --from=skopeo-build /usr/bin/skopeo /usr/bin/skopeo
 COPY --chown=snyk:snyk --from=skopeo-build /etc/containers/registries.d/default.yaml /etc/containers/registries.d/default.yaml
 COPY --chown=snyk:snyk --from=skopeo-build /etc/containers/policy.json /etc/containers/policy.json
 

snyk-operator-certified/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/helm-operator:v1.15
+FROM quay.io/operator-framework/helm-operator:v1.17
 
 LABEL name="Snyk Operator" \
       maintainer="[email protected]" \

snyk-operator/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/helm-operator:v1.15
+FROM quay.io/operator-framework/helm-operator:v1.17
 
 LABEL name="Snyk Operator" \
       maintainer="[email protected]" \

test/fixtures/insecure-registries/push-dockerhub-image-to-local-registry.yaml

@@ -9,16 +9,12 @@ spec:
         - name: docker-io
       containers:
         - name: my-container
-          image: docker.io/library/golang:1.13.1-alpine3.10
+          image: docker.io/library/fedora:35
           command: 
             - "sh"
           args:
             - "-c"
-            - "apk --no-cache add git make gcc musl-dev ostree-dev go-md2man &&
-            git clone --depth 1 -b 'v0.2.0' https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo &&
-            cd $GOPATH/src/github.com/containers/skopeo &&
-            make binary-local-static DISABLE_CGO=1 &&
-            make install &&
+            - "dnf install -y skopeo &&
             skopeo copy --dest-tls-verify=false docker://docker.io/library/python:rc-buster docker://kind-registry:5000/python:rc-buster"
       restartPolicy: Never
   backoffLimit: 4