Merge branch 'master' into alpine

.goreleaser.yml

@@ -3,6 +3,8 @@ release:
 
 builds:
   - binary: dive
+    env:
+      - CGO_ENABLED=0
     goos:
       - windows
       - darwin

Dockerfile

@@ -1,5 +1,10 @@
 FROM alpine:3.10
-COPY --from=wagoodman/dive:dev /usr/local/bin/docker /usr/local/bin/
+
+ARG DOCKER_CLI_VERSION=19.03.1
+RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_CLI_VERSION}.tgz | \
+    tar -xzf - docker/docker --strip-component=1 && \
+    mv docker /usr/local/bin
+
 COPY dive /usr/local/bin/
-RUN apk add -U --no-cache gpgme device-mapper
+
 ENTRYPOINT ["/usr/local/bin/dive"]

Makefile

@@ -12,11 +12,15 @@ run-large: build
 	$(BUILD_PATH) amir20/clashleaders:latest
 
 run-podman: build
+	$(BUILD_PATH)  localhost/dive-example:latest  --source podman
+
+run-podman-build: build
 	podman build -t dive-example:latest -f .data/Dockerfile.example .
-	$(BUILD_PATH) localhost/dive-example:latest --engine podman
+	$(BUILD_PATH) localhost/dive-example:latest --source podman
+
 
 run-podman-large: build
-	$(BUILD_PATH) docker.io/amir20/clashleaders:latest --engine podman
+	$(BUILD_PATH) docker.io/amir20/clashleaders:latest --source podman
 
 run-ci: build
 	CI=true $(BUILD_PATH) dive-example:latest --ci-config .data/.dive-ci

README.md

@@ -82,14 +82,14 @@ With valid `source` options as such:
 
 **Ubuntu/Debian**
 ```bash
-wget https://github.com/wagoodman/dive/releases/download/v0.9.0/dive_0.9.0_linux_amd64.deb
-sudo apt install ./dive_0.9.0_linux_amd64.deb
+wget https://github.com/wagoodman/dive/releases/download/v0.9.1/dive_0.9.1_linux_amd64.deb
+sudo apt install ./dive_0.9.1_linux_amd64.deb
 ```
 
 **RHEL/Centos**
 ```bash
-curl -OL https://github.com/wagoodman/dive/releases/download/v0.9.0/dive_0.9.0_linux_amd64.rpm
-rpm -i dive_0.9.0_linux_amd64.rpm
+curl -OL https://github.com/wagoodman/dive/releases/download/v0.9.1/dive_0.9.1_linux_amd64.rpm
+rpm -i dive_0.9.1_linux_amd64.rpm
 ```
 
 **Arch Linux**
@@ -108,11 +108,11 @@ The above example assumes [`yay`](https://aur.archlinux.org/packages/yay/) as th
 brew install dive
 ```
 
-or download the latest Darwin build from the [releases page](https://github.com/wagoodman/dive/releases/download/v0.9.0/dive_0.9.0_darwin_amd64.tar.gz).
+or download the latest Darwin build from the [releases page](https://github.com/wagoodman/dive/releases/download/v0.9.1/dive_0.9.1_darwin_amd64.tar.gz).
 
 **Windows**
 
-Download the [latest release](https://github.com/wagoodman/dive/releases/download/v0.9.0/dive_0.9.0_windows_amd64.zip).
+Download the [latest release](https://github.com/wagoodman/dive/releases/download/v0.9.1/dive_0.9.1_windows_amd64.zip).
 
 **Go tools**
 Requires Go version 1.9 or higher.

dive/image/podman/cli.go

@@ -5,6 +5,7 @@ package podman
 import (
 	"fmt"
 	"github.com/wagoodman/dive/utils"
+	"io"
 	"os"
 	"os/exec"
 )
@@ -27,6 +28,25 @@ func runPodmanCmd(cmdStr string, args ...string) error {
 	return cmd.Run()
 }
 
+func streamPodmanCmd(args ...string) (error, io.Reader) {
+	if !isPodmanClientBinaryAvailable() {
+		return fmt.Errorf("cannot find podman client executable"), nil
+	}
+
+	cmd := exec.Command("podman", utils.CleanArgs(args)...)
+	cmd.Env = os.Environ()
+
+	reader, writer, err := os.Pipe()
+	if err != nil {
+		return err, nil
+	}
+
+	cmd.Stdout = writer
+	cmd.Stderr = os.Stderr
+
+	return cmd.Start(), reader
+}
+
 func isPodmanClientBinaryAvailable() bool {
 	_, err := exec.LookPath("podman")
 	return err == nil