From 48b7005a80f78db526c9937e88bd8355336b395b Mon Sep 17 00:00:00 2001 From: Nathan Zender Date: Fri, 14 Aug 2020 16:44:23 -0400 Subject: [PATCH] We have a full directory of test docker files use those instead of these at the root. Update docs to accomadate changes --- Dockerfile.alpine | 11 ----------- Dockerfile.fedora | 11 ----------- Dockerfile.ubuntu | 13 ------------- README.md | 14 ++++++++++---- 4 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 Dockerfile.alpine delete mode 100644 Dockerfile.fedora delete mode 100644 Dockerfile.ubuntu diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index 8f976f5..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,11 +0,0 @@ -FROM alpine:latest - -WORKDIR /tmp/ahab - -COPY ahab . - -RUN chmod +x ahab - -RUN apk update && apk add ca-certificates - -RUN apk info -vv | sort | ./ahab chase --os alpine diff --git a/Dockerfile.fedora b/Dockerfile.fedora deleted file mode 100644 index 6a2fdbd..0000000 --- a/Dockerfile.fedora +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:latest - -WORKDIR /tmp/ahab - -COPY ahab . - -RUN chmod +x ahab - -RUN dnf upgrade -y && dnf check-update - -RUN dnf list installed | ./ahab chase --os fedora diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu deleted file mode 100644 index 6df3324..0000000 --- a/Dockerfile.ubuntu +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:latest - -WORKDIR /tmp/ahab - -COPY ahab . - -RUN chmod +x ahab - -RUN apt-get update && apt-get install -y ca-certificates - -RUN update-ca-certificates - -RUN dpkg-query --show --showformat='${Package} ${Version}\n' | ./ahab chase diff --git a/README.md b/README.md index 64e15be..20636fd 100644 --- a/README.md +++ b/README.md @@ -66,21 +66,27 @@ Ubuntu ``` $ GOOS=linux GOARCH=amd64 go build -$ docker build -f Dockerfile.ubuntu . -t test +$ docker build -f docker/dpkg-query-autodetect/Dockerfile . -t test ``` -Fedora +Fedora older (yum based) ``` $ GOOS=linux GOARCH=amd64 go build -$ docker build -f Dockerfile.fedora . -t test +$ docker build -f docker/yum-autodetect/Dockerfile . -t test +``` + +Fedora latest (dnf based) +``` +$ GOOS=linux GOARCH=amd64 go build +$ docker build -f docker/dnf-autodetect/Dockerfile . -t test ``` Alpine ``` $ GOOS=linux GOARCH=amd64 go build -$ docker build -f Dockerfile.alpine . -t test +$ docker build -f docker/apk-autodetect/Dockerfile . -t test ``` Depending on the OS, you'll see Ahab run and fail (Ubuntu and Fedora) or succeed (Alpine).