From 193181324bf2d3ac9cdab2a78938b0602e033092 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Sun, 1 May 2022 15:27:37 +0300 Subject: [PATCH 01/10] use ubi8 container base image --- contrib/docker/Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 4e5ac1198..1a9c21b1d 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,4 +1,13 @@ -FROM docker.io/library/golang:1.17 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12-10 as builder +ARG BUILD_VERSION="unknown" + +WORKDIR /opt/app-root + +# TEMPORARY STEPS UNTIL ubi8 releases a go1.17 image +RUN wget --no-check-certificate https://go.dev/dl/go1.17.6.linux-amd64.tar.gz && tar -xzf go1.17.6.linux-amd64.tar.gz +ENV GOROOT /opt/app-root/go +ENV PATH $GOROOT/bin:$PATH +# END OF LINES TO REMOVE WORKDIR /app @@ -30,4 +39,4 @@ COPY --from=builder /app/confgenerator /app/ # expose ports EXPOSE 2055 -ENTRYPOINT ["/app/flowlogs-pipeline"] \ No newline at end of file +ENTRYPOINT ["/app/flowlogs-pipeline"] From 74de42136f36df9e639815ca782683a7c64fcdd1 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Sun, 1 May 2022 17:48:46 +0300 Subject: [PATCH 02/10] commented out rm bin --- contrib/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 1a9c21b1d..399dd0586 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -21,7 +21,7 @@ RUN go mod download RUN go mod download -modfile=.bingo/golangci-lint.mod COPY . ./ -RUN rm -rf bin +#RUN rm -rf bin RUN git status --porcelain RUN make build_code From f33745208f022a071931437f0ce935526a83d7f9 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Mon, 2 May 2022 12:52:02 +0300 Subject: [PATCH 03/10] restored 'rm -rf bin' --- contrib/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 399dd0586..1a9c21b1d 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -21,7 +21,7 @@ RUN go mod download RUN go mod download -modfile=.bingo/golangci-lint.mod COPY . ./ -#RUN rm -rf bin +RUN rm -rf bin RUN git status --porcelain RUN make build_code From 247953de2934697e86f5cb2a536d735146c4cb40 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Wed, 4 May 2022 12:02:44 +0300 Subject: [PATCH 04/10] used .dockerignore to avoid the bin directory in the build --- contrib/docker/.dockeringnore | 2 ++ contrib/docker/Dockerfile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 contrib/docker/.dockeringnore diff --git a/contrib/docker/.dockeringnore b/contrib/docker/.dockeringnore new file mode 100644 index 000000000..ef74873b4 --- /dev/null +++ b/contrib/docker/.dockeringnore @@ -0,0 +1,2 @@ +.git +/bin/ diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 1a9c21b1d..89d1d5bc0 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -21,7 +21,6 @@ RUN go mod download RUN go mod download -modfile=.bingo/golangci-lint.mod COPY . ./ -RUN rm -rf bin RUN git status --porcelain RUN make build_code From 715e887c440a99fb0ef5354dd1481dea579590c0 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Sun, 8 May 2022 16:50:13 +0300 Subject: [PATCH 05/10] corrected .dockerignore file --- .dockerignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..e660fd93d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +bin/ From 25aeab77a17a2721b875e6ce404d8ffe2fb27d83 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Mon, 9 May 2022 09:43:46 +0300 Subject: [PATCH 06/10] removed git from docker build --- .dockerignore | 1 + Makefile | 2 +- contrib/docker/.dockeringnore | 2 -- contrib/docker/Dockerfile | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 contrib/docker/.dockeringnore diff --git a/.dockerignore b/.dockerignore index e660fd93d..83cb547cf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ +.git bin/ diff --git a/Makefile b/Makefile index 9e4975e6c..5731db56a 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ tests-unit: validate_go ## Unit tests .PHONY: tests-e2e tests-e2e: validate_go $(KIND) ## End-to-end tests - go test -p 1 -v -timeout 1200s -race $$(go list ./... | grep /e2e) + go test -p 1 -v -timeout 30m -race $$(go list ./... | grep /e2e) .PHONY: tests-all tests-all: validate_go tests-unit tests-e2e ## All tests diff --git a/contrib/docker/.dockeringnore b/contrib/docker/.dockeringnore deleted file mode 100644 index ef74873b4..000000000 --- a/contrib/docker/.dockeringnore +++ /dev/null @@ -1,2 +0,0 @@ -.git -/bin/ diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 89d1d5bc0..bbb094e2d 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -21,7 +21,6 @@ RUN go mod download RUN go mod download -modfile=.bingo/golangci-lint.mod COPY . ./ -RUN git status --porcelain RUN make build_code # final stage From f265960cd6e71d71d89694faf0d93bbcb896e499 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Tue, 10 May 2022 15:41:13 +0300 Subject: [PATCH 07/10] removed .git from .dockerignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 83cb547cf..e660fd93d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1 @@ -.git bin/ From 0152d225da0b268b244457c553d027e24c725836 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Wed, 11 May 2022 14:40:14 +0300 Subject: [PATCH 08/10] used ubi-minimal forfinal image --- Makefile | 2 +- contrib/docker/Dockerfile | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5731db56a..f2743e770 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ tests-unit: validate_go ## Unit tests .PHONY: tests-e2e tests-e2e: validate_go $(KIND) ## End-to-end tests - go test -p 1 -v -timeout 30m -race $$(go list ./... | grep /e2e) + go test -p 1 -v -timeout 20m -race $$(go list ./... | grep /e2e) .PHONY: tests-all tests-all: validate_go tests-unit tests-e2e ## All tests diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index bbb094e2d..afab24750 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -21,15 +21,18 @@ RUN go mod download RUN go mod download -modfile=.bingo/golangci-lint.mod COPY . ./ +RUN rm -rf bin +RUN git status --porcelain RUN make build_code # final stage -FROM ubuntu -RUN apt-get update && apt-get install -y \ - netbase \ +FROM registry.access.redhat.com/ubi8/ubi-minimal +USER root +RUN microdnf install -y \ + iputils \ curl \ net-tools \ - && rm -rf /var/lib/apt/lists/* + && microdnf -y clean all && rm -rf /var/cache COPY --from=builder /app/flowlogs-pipeline /app/ COPY --from=builder /app/confgenerator /app/ From 3a1f65e655793d1f2e489f93822555c16d1cfc00 Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Wed, 11 May 2022 15:30:01 +0300 Subject: [PATCH 09/10] added USER 1001 --- contrib/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index afab24750..5939b42bf 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -10,6 +10,7 @@ ENV PATH $GOROOT/bin:$PATH # END OF LINES TO REMOVE WORKDIR /app +USER 1001 # Copy source code COPY go.mod . From 92002f44e2a28303b5bef1195afb4f9974786e4a Mon Sep 17 00:00:00 2001 From: Kalman Meth Date: Thu, 12 May 2022 10:05:37 +0300 Subject: [PATCH 10/10] revert to golang container for build --- contrib/docker/Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 5939b42bf..798527df0 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,16 +1,6 @@ -FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12-10 as builder -ARG BUILD_VERSION="unknown" - -WORKDIR /opt/app-root - -# TEMPORARY STEPS UNTIL ubi8 releases a go1.17 image -RUN wget --no-check-certificate https://go.dev/dl/go1.17.6.linux-amd64.tar.gz && tar -xzf go1.17.6.linux-amd64.tar.gz -ENV GOROOT /opt/app-root/go -ENV PATH $GOROOT/bin:$PATH -# END OF LINES TO REMOVE +FROM docker.io/library/golang:1.17 as builder WORKDIR /app -USER 1001 # Copy source code COPY go.mod . @@ -28,7 +18,6 @@ RUN make build_code # final stage FROM registry.access.redhat.com/ubi8/ubi-minimal -USER root RUN microdnf install -y \ iputils \ curl \