feat: user credentials helper for ACR, GCR, ECR

Author: ivanstanev

Dockerfile

@@ -10,8 +10,10 @@ RUN cd $GOPATH/src/github.com/containers/skopeo \
   && make bin/skopeo DISABLE_CGO=1 \
   && make install
 
+FROM golang:1.17 AS cred-helpers-build
+
 RUN go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
-RUN cp $HOME/go/bin/docker-credential-ecr-login /usr/local/bin/docker-credential-ecr-login
+RUN go get -u github.com/chrismellard/docker-credential-acr-env
 
 #---------------------------------------------------------------------
 # STAGE 2: Build the kubernetes-monitor
@@ -31,7 +33,7 @@ ENV NODE_ENV production
 RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
 RUN yum install -y nodejs
 
-RUN curl -L -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
+RUN curl -L -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
 RUN chmod 755 /usr/bin/dumb-init
 
 RUN groupadd -g 10001 snyk
@@ -43,10 +45,13 @@ RUN bash /install.sh --disable-prompts --install-dir=/ && rm /google-cloud-sdk/b
 ENV PATH=/google-cloud-sdk/bin:$PATH
 RUN rm /install.sh
 
+# Copy credential helpers
+COPY --chown=snyk:snyk --from=cred-helpers-build /go/bin/docker-credential-ecr-login /usr/bin/docker-credential-ecr-login
+COPY --chown=snyk:snyk --from=cred-helpers-build /go/bin/docker-credential-acr-env /usr/bin/docker-credential-acr-env
+
 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/local/bin/docker-credential-ecr-login /usr/bin/docker-credential-ecr-login
 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
 

test/setup/index.ts

@@ -46,15 +46,15 @@ export async function removeMonitor(): Promise<void> {
     } else {
       await platforms[testPlatform].clean();
     }
-  } catch (error) {
+  } catch (error: any) {
     console.log(`Could not remove the Kubernetes-Monitor: ${error.message}`);
   }
 }
 
 export async function removeLocalContainerRegistry(): Promise<void> {
   try {
     await exec('docker rm kind-registry --force');
-  } catch (error) {
+  } catch (error: any) {
     console.log(
       `Could not remove container registry, it probably did not exist: ${error.message}`,
     );
@@ -64,7 +64,7 @@ export async function removeLocalContainerRegistry(): Promise<void> {
 export async function removeUnusedKindNetwork(): Promise<void> {
   try {
     await exec('docker network rm kind');
-  } catch (error) {
+  } catch (error: any) {
     console.log(`Could not remove "kind" network: ${error.message}`);
   }
 }