Skip to content

Commit

Permalink
gProfiler 1.30.0 & reenable staticx for Aarch64 (#806)
Browse files Browse the repository at this point in the history
PR #622 accidentally removed invocation of staticx on Aarch64 builds.
  • Loading branch information
d3dave authored Jun 21, 2023
1 parent 38d9d68 commit d2141c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gprofiler/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright (c) Granulate. All rights reserved.
# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
#
__version__ = "1.29.0"
__version__ = "1.30.0"
11 changes: 4 additions & 7 deletions pyi.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -287,14 +287,11 @@ COPY ./scripts/list_needed_libs.sh ./scripts/list_needed_libs.sh
# in some cases, when the application is lazily loading some DSOs, staticx doesn't handle it.
# we use list_needed_libs.sh to list the dynamic dependencies of *all* of our resources,
# and make staticx pack them as well.
# using scl here to get the proper LD_LIBRARY_PATH set
# hadolint ignore=SC2046,SC2086
# hadolint ignore=SC2086
RUN set -e; \
if [ $(uname -m) != "aarch64" ]; then \
LIBS=$(./scripts/list_needed_libs.sh) && \
staticx $LIBS dist/gprofiler dist/gprofiler ; \
fi
LIBS=$(./scripts/list_needed_libs.sh) && \
staticx $LIBS dist/gprofiler dist/gprofiler.static

FROM scratch AS export-stage

COPY --from=build-stage /app/dist/gprofiler /gprofiler
COPY --from=build-stage /app/dist/gprofiler.static /gprofiler

0 comments on commit d2141c1

Please sign in to comment.