From 584f8e779b6815f3cb55c2a401459fae419de808 Mon Sep 17 00:00:00 2001 From: Dominic Breuker Date: Fri, 9 Mar 2018 08:55:49 +0100 Subject: [PATCH] move unit tests from image build to contrainer run --- docker/Dockerfile.testing | 4 +--- docker/entrypoint-testing.sh | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index 3bb36a9..7067381 100644 --- a/docker/Dockerfile.testing +++ b/docker/Dockerfile.testing @@ -9,10 +9,8 @@ COPY cmd /go/src/github.com/dominicbreuker/pspy/cmd COPY internal /go/src/github.com/dominicbreuker/pspy/internal COPY vendor /go/src/github.com/dominicbreuker/pspy/vendor -# run tests -WORKDIR /go/src/github.com/dominicbreuker/pspy -# RUN go test ./... # build executable +WORKDIR /go/src/github.com/dominicbreuker/pspy RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o bin/pspy main.go ### Prepare integration test ### diff --git a/docker/entrypoint-testing.sh b/docker/entrypoint-testing.sh index 30a8508..2776027 100644 --- a/docker/entrypoint-testing.sh +++ b/docker/entrypoint-testing.sh @@ -1,5 +1,10 @@ #!/bin/bash +# run unit tests +echo "[+] running unit tests" +sudo /bin/sh -c 'GOPATH=/go /usr/local/go/bin/go test ./...' + +# run integration test sudo cron -f & sleep 1 sudo ps | grep cron 1>/dev/null