Skip to content

Commit

Permalink
Add common CAs to container images
Browse files Browse the repository at this point in the history
commit_hash:2892020e0145e5746f34824410ed69c23a27ede2
  • Loading branch information
MikailBag committed Feb 10, 2025
1 parent c419911 commit 89d4cd1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 15 deletions.
21 changes: 13 additions & 8 deletions perforator/deploy/docker/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,46 @@ RUN cd autofdo && \

####################################################################################################################

FROM ubuntu:24.04 AS agent
FROM ubuntu:24.04 AS base
RUN apt-get update && apt-get install -y ca-certificates

####################################################################################################################

FROM base AS agent
COPY --from=build /out/perforator/bundle/agent /perforator/agent

####################################################################################################################

FROM ubuntu:24.04 AS gc
FROM base AS gc
COPY --from=build /out/perforator/bundle/gc /perforator/gc

####################################################################################################################

FROM ubuntu:24.04 AS storage
FROM base AS storage
COPY --from=build /out/perforator/bundle/storage /perforator/storage

####################################################################################################################

FROM ubuntu:24.04 AS proxy
FROM base AS proxy
COPY --from=build /out/perforator/bundle/proxy /perforator/proxy
COPY --from=autofdo_build /autofdo/autofdo/build/create_llvm_prof /perforator/create_llvm_prof

####################################################################################################################

FROM ubuntu:24.04 AS web
FROM base AS web
COPY --from=build /out/perforator/bundle/web /perforator/web

####################################################################################################################

FROM ubuntu:24.04 AS migrate
FROM base AS migrate
COPY --from=build /out/perforator/bundle/migrate /perforator/migrate

####################################################################################################################

FROM ubuntu:24.04 AS offline_processing
FROM base AS offline_processing
COPY --from=build /out/perforator/bundle/offline_processing /perforator/offline_processing

####################################################################################################################

FROM scratch AS cli
FROM base AS cli
COPY --from=build /out/perforator/bundle/cli /perforator/cli
17 changes: 10 additions & 7 deletions perforator/deploy/docker/Dockerfile.prebuilt
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
# Note: this dockerfile assumes that context contains already built binaries.
# See docs for details.

FROM ubuntu:24.04 AS agent
FROM ubuntu:24.04 AS base
RUN apt-get update && apt-get install -y ca-certificates

FROM base AS agent
COPY /agent /perforator/agent

FROM ubuntu:24.04 AS gc
FROM base AS gc
COPY /gc /perforator/gc

FROM ubuntu:24.04 AS storage
FROM base AS storage
COPY /storage /perforator/storage

FROM ubuntu:24.04 AS proxy
FROM base AS proxy
COPY /proxy /perforator/proxy
COPY /create_llvm_prof /perforator/create_llvm_prof

FROM ubuntu:24.04 AS web
FROM base AS web
COPY /web /perforator/web

FROM ubuntu:24.04 AS migrate
FROM base AS migrate
COPY /migrate /perforator/migrate

FROM ubuntu:24.04 AS offline_processing
FROM base AS offline_processing
COPY /offline_processing /perforator/offline_processing

0 comments on commit 89d4cd1

Please sign in to comment.