Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use ubi8 container base image #195

Merged
merged 10 commits into from
May 19, 2022
Merged

use ubi8 container base image #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1931813
use ubi8 container base image
KalmanMeth May 1, 2022
74de421
commented out rm bin
KalmanMeth May 1, 2022
f337452
restored 'rm -rf bin'
KalmanMeth May 2, 2022
247953d
used .dockerignore to avoid the bin directory in the build
KalmanMeth May 4, 2022
715e887
corrected .dockerignore file
KalmanMeth May 8, 2022
25aeab7
removed git from docker build
KalmanMeth May 9, 2022
f265960
removed .git from .dockerignore
KalmanMeth May 10, 2022
0152d22
used ubi-minimal forfinal image
KalmanMeth May 11, 2022
3a1f65e
added USER 1001
KalmanMeth May 11, 2022
92002f4
revert to golang container for build
KalmanMeth May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin/
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 20m -race $$(go list ./... | grep /e2e)

.PHONY: tests-all
tests-all: validate_go tests-unit tests-e2e ## All tests
Expand Down
10 changes: 5 additions & 5 deletions contrib/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ 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
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/

# expose ports
EXPOSE 2055

ENTRYPOINT ["/app/flowlogs-pipeline"]
ENTRYPOINT ["/app/flowlogs-pipeline"]