add podman dependencies to docker image (switch to debian)

This commit is contained in:
Alex Goodman 2019-11-05 00:01:33 -05:00
parent bbc02ef34d
commit 7ec08a364b
No known key found for this signature in database
GPG key ID: 98AF011C5C78EB7E
5 changed files with 16 additions and 23 deletions

View file

@ -25,19 +25,6 @@ dockers:
- "quay.io/wagoodman/dive:v{{ .Major }}"
- "quay.io/wagoodman/dive:v{{ .Major }}.{{ .Minor }}"
- "quay.io/wagoodman/dive:latest"
-
binaries:
- dive
dockerfile: Dockerfile.full
image_templates:
- "wagoodman/dive:{{ .Tag }}-full"
- "wagoodman/dive:v{{ .Major }}-full"
- "wagoodman/dive:v{{ .Major }}.{{ .Minor }}-full"
- "wagoodman/dive:full"
- "quay.io/wagoodman/dive:{{ .Tag }}-full"
- "quay.io/wagoodman/dive:v{{ .Major }}-full"
- "quay.io/wagoodman/dive:v{{ .Major }}.{{ .Minor }}-full"
- "quay.io/wagoodman/dive:full"
archive:
format: tar.gz

View file

@ -1,3 +1,12 @@
FROM alpine:3.10
COPY dist/dive_linux_amd64/dive /
ENTRYPOINT ["/dive"]
FROM debian:sid-slim
RUN apt-get update && apt-get install -y \
curl \
libdevmapper1.02.1 \
libgpgme11-dev \
&& rm -rf /var/lib/apt/lists/* \
&& ln -s /lib/x86_64-linux-gnu/libdevmapper.so.1.02.1 /usr/lib/libdevmapper.so.1.02
ARG DOCKER_CLI_VERSION="19.03.1"
RUN curl -L https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_CLI_VERSION.tgz | \
tar -xz --strip-component=1 -C /usr/local/bin/ docker/docker
COPY dist/dive_linux_amd64/dive /usr/local/bin/
ENTRYPOINT ["/usr/local/bin/dive"]

View file

@ -1,7 +0,0 @@
FROM alpine:3.10
ARG DOCKER_CLI_VERSION="19.03.1"
RUN apk --update add curl &&\
curl -L https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_CLI_VERSION.tgz | \
tar -xzf - docker/docker --strip-component=1 -C /tmp
COPY dist/dive_linux_amd64/dive /
ENTRYPOINT ["/dive"]

View file

@ -32,6 +32,7 @@ func run(enableUi bool, options Options, imageResolver image.Resolver, events ev
return
}
} else {
events.message(utils.TitleFormat("Image Source: ") + options.Source.String() + "://" + options.Image)
events.message(utils.TitleFormat("Fetching image...") + " (this can take a while for large images)")
img, err = imageResolver.Fetch(options.Image)
if err != nil {

View file

@ -105,6 +105,7 @@ func TestRun(t *testing.T) {
BuildArgs: nil,
},
events: []testEvent{
{stdout: "Image Source: docker://dive-example", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Fetching image... (this can take a while for large images)", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Analyzing image...", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Building cache...", stderr: "", errorOnExit: false, errMessage: ""},
@ -122,6 +123,7 @@ func TestRun(t *testing.T) {
BuildArgs: []string{},
},
events: []testEvent{
{stdout: "Image Source: docker://dive-example", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Fetching image... (this can take a while for large images)", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Analyzing image...", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Building cache...", stderr: "", errorOnExit: false, errMessage: ""},
@ -154,6 +156,7 @@ func TestRun(t *testing.T) {
BuildArgs: nil,
},
events: []testEvent{
{stdout: "Image Source: docker://dive-example", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "Fetching image... (this can take a while for large images)", stderr: "", errorOnExit: false, errMessage: ""},
{stdout: "", stderr: "cannot fetch image", errorOnExit: true, errMessage: "some fetch failure"},
},