Skip to content

Commit

Permalink
Merge pull request #499 from fortum-vaanavil/patch-1
Browse files Browse the repository at this point in the history
Install netcat and jq in the common stage
  • Loading branch information
roekatz committed Sep 19, 2023
2 parents 8c5c2c2 + 51ca1b9 commit 8527bc9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ WORKDIR /opal
COPY scripts/wait-for.sh .
RUN chmod +x ./wait-for.sh
RUN ln -s /opal/wait-for.sh /usr/wait-for.sh

# netcat (nc) is used by the wait-for.sh script
RUN apt-get update && apt-get install -y netcat jq && apt-get clean

# copy startup script (create link at old path to maintain backward compatibility)
COPY ./scripts/start.sh .
RUN chmod +x ./start.sh
Expand Down Expand Up @@ -105,8 +109,6 @@ FROM client-standalone as client
# Temporarily move back to root for additional setup
USER root

RUN apt-get update && apt-get install -y netcat jq && apt-get clean

# copy opa from opa-extractor
COPY --from=opa-extractor /opal/opa ./opa

Expand All @@ -124,8 +126,6 @@ FROM client-standalone as client-cedar
# Temporarily move back to root for additional setup
USER root

RUN apt-get update && apt-get install -y netcat jq && apt-get clean

# Copy cedar from its build stage
COPY --from=cedar-builder /cedar-agent /bin/cedar-agent

Expand All @@ -142,7 +142,7 @@ USER opal
# ---------------------------------------------------
FROM common as server

RUN apt-get update && apt-get install -y openssh-client git curl jq netcat && apt-get clean
RUN apt-get update && apt-get install -y openssh-client git curl && apt-get clean

USER opal

Expand Down

0 comments on commit 8527bc9

Please sign in to comment.