Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker-archive: Add support for kaniko #327

Merged

Conversation

avisiedo
Copy link
Contributor

Added the pointed out changes at #318 by @labooner

Tested into the workstation by:

docker run --rm -it -v "$PWD:/workspace:z" -w /workspace gcr.io/kaniko-project/executor:debug --destination="dive-test:kaniko-latest" --force --no-push --tarPath .data/test-kaniko-image.tar
./dist/dive_linux_amd64/dive --ci docker-archive://.data/test-kaniko-image.tar

But it needed some changes (not included as I didn't research the impact):

diff --git a/Dockerfile b/Dockerfile
index 24056d8..4a4fa8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine:3.12
+FROM fedora:32
 
-ARG DOCKER_CLI_VERSION=${DOCKER_CLI_VERSION}
-RUN wget -O- https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_CLI_VERSION}.tgz | \
-    tar -xzf - docker/docker --strip-component=1 && \
-    mv docker /usr/local/bin
+ARG DOCKER_CLI_VERSION=19.03.9
+# RUN wget -O- https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_CLI_VERSION}.tgz | \
+RUN curl -sfL https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_CLI_VERSION}.tgz \
+      | tar -xzf - docker/docker --strip-component=1 \
+    && mv docker /usr/local/bin
 
-COPY dive /usr/local/bin/
+COPY ./dist/dive_linux_amd64/dive /usr/local/bin/dive
 
 ENTRYPOINT ["/usr/local/bin/dive"]

Hoping this help.

@lukasmrtvy
Copy link

@wagoodman merge ?

@wagoodman
Copy link
Owner

thanks for the contribution (and your patience)!

@wagoodman wagoodman merged commit 739416b into wagoodman:master Dec 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants