Skip to content

Commit

Permalink
Remove curl from frontend image
Browse files Browse the repository at this point in the history
This is to remove dependency to openldap and its vulnerabilities
  • Loading branch information
terolaakso committed Nov 20, 2024
1 parent 5074b16 commit b0f4437
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions compose/e2e/playwright.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ RUN apt-get update \
RUN yarn exec playwright install --with-deps

COPY ./playwright/bin/run-tests.sh /bin/
COPY ./playwright/bin/wait-for-url.sh /bin/

CMD ["/bin/run-tests.sh"]
6 changes: 3 additions & 3 deletions compose/e2e/playwright/bin/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ yarn install --immutable
yarn exec playwright install

echo 'INFO: Waiting for compose stack to be up ...'
./wait-for-url.sh "${PROXY_URL}/api/internal/dev-api"
./wait-for-url.sh "${KEYCLOAK_URL}/auth/realms/evaka-customer/account/" "200"
./wait-for-url.sh "${DUMMY_SUOMIFI_URL}/health" "200"
wait-for-url.sh "${PROXY_URL}/api/internal/dev-api"
wait-for-url.sh "${KEYCLOAK_URL}/auth/realms/evaka-customer/account/" "200"
wait-for-url.sh "${DUMMY_SUOMIFI_URL}/health" "200"

echo "Running tests ..."

Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ RUN cd /tmp \
&& curl -sSfLO https://github.com/DataDog/dd-opentracing-cpp/releases/download/${DD_OPENTRACING_CPP_VERSION}/linux-amd64-libdd_opentracing_plugin.so.gz \
&& echo "${DD_OPENTRACING_CPP_SHA256} linux-amd64-libdd_opentracing_plugin.so.gz" | sha256sum -c - \
&& gunzip linux-amd64-libdd_opentracing_plugin.so.gz -c > /usr/local/lib/libdd_opentracing_plugin.so \
&& rm linux-amd64-libdd_opentracing_plugin.so.gz
&& rm linux-amd64-libdd_opentracing_plugin.so.gz \
&& apt-get remove --auto-remove -y curl

COPY ./proxy/files/bin/ /bin/
COPY ./proxy/files/internal/ /internal/
Expand Down

0 comments on commit b0f4437

Please sign in to comment.