Skip to content

Commit

Permalink
fix: omit apm-agent, perhaps temporarily
Browse files Browse the repository at this point in the history
Refs: OPS-10294

It's blocking the build
  • Loading branch information
lazysoundsystem committed Apr 17, 2024
1 parent be1db5d commit 0c5b9d4
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ COPY --from=builder /srv/www/PATCHES /srv/www/PATCHES
COPY --from=builder /srv/www/docker/99-elastic-apm-custom.ini /tmp/99-elastic-apm-custom.ini
COPY --from=builder /srv/www/docker/etc/nginx/ratelimit.conf.template /etc/nginx/ratelimit.conf.template

RUN curl -L -o /tmp/apm-agent-php_all.apk https://github.com/elastic/apm-agent-php/releases/download/v1.10.0/apm-agent-php_1.10.0_all.apk && \
apk add --allow-untrusted /tmp/apm-agent-php_all.apk && \
rm -f /tmp/apm-agent-php_all.apk && \
mv -f /tmp/99-elastic-apm-custom.ini /etc/php82/conf.d/99-elastic-apm-custom.ini
# Removing apm-agent, perhaps temporarily:
# See https://github.com/UN-OCHA/gms-site/pull/429
# RUN curl -L -o /tmp/apm-agent-php_all.apk https://github.com/elastic/apm-agent-php/releases/download/v1.10.0/apm-agent-php_1.10.0_all.apk && \
# apk add --allow-untrusted /tmp/apm-agent-php_all.apk && \
# rm -f /tmp/apm-agent-php_all.apk && \
# mv -f /tmp/99-elastic-apm-custom.ini /etc/php82/conf.d/99-elastic-apm-custom.ini

0 comments on commit 0c5b9d4

Please sign in to comment.