-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix and improve the docker image building process of Flow Aggregator (#…
…2016) Fix the error of Flow Aggregator image after PR #2004 changed the base image to scratch. Change the image name target "flow-aggregator-ubuntu" to "flow-aggregtor-image" in Makefile since ubuntu is not relevant. Change the base image of Flow Aggregator code coverage image to ubuntu:20.04.
- Loading branch information
1 parent
a2eacf7
commit 117cd94
Showing
10 changed files
with
34 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,19 @@ | ||
ARG OVS_VERSION | ||
FROM golang:1.15 as flow-aggregator-build | ||
|
||
WORKDIR /antrea | ||
|
||
COPY . /antrea | ||
|
||
RUN make flow-aggregator | ||
# Make sure the flow-aggregator binary is statically linked. | ||
RUN CGO_ENABLED=0 make flow-aggregator | ||
|
||
FROM scratch | ||
|
||
LABEL maintainer="Antrea <[email protected]>" | ||
LABEL description="The docker image for the flow aggregator" | ||
|
||
USER root | ||
ENV USER root | ||
|
||
COPY --from=flow-aggregator-build /antrea/bin/flow-aggregator /usr/local/bin/ | ||
COPY --from=flow-aggregator-build /antrea/bin/flow-aggregator / | ||
|
||
ENTRYPOINT ["/flow-aggregator"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
ARG OVS_VERSION | ||
FROM golang:1.15 as flow-aggregator-build | ||
|
||
WORKDIR /antrea | ||
|
@@ -7,7 +6,7 @@ COPY . /antrea | |
|
||
RUN make flow-aggregator flow-aggregator-instr-binary | ||
|
||
FROM antrea/base-ubuntu:${OVS_VERSION} | ||
FROM ubuntu:20.04 | ||
|
||
LABEL maintainer="Antrea <[email protected]>" | ||
LABEL description="The docker image for the flow aggregator with code coverage measurement enabled for testing purposes." | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
--config | ||
/etc/flow-aggregator/flow-aggregator.conf | ||
--logtostderr=false | ||
--log_dir=/var/log/flowaggregator | ||
--log_dir=/var/log/antrea/flow-aggregator | ||
--alsologtostderr | ||
--log_file_max_size=100 | ||
--log_file_max_num=4 |