From 07a32cd1aa2637f451c853a3834689915ebddf49 Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Sun, 18 Jun 2023 17:17:40 +0300 Subject: [PATCH 1/8] reenable staticx for arm --- pyi.Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 44c7af4a1..78205082d 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -291,9 +291,10 @@ COPY ./scripts/list_needed_libs.sh ./scripts/list_needed_libs.sh # hadolint ignore=SC2046,SC2086 RUN set -e; \ if [ $(uname -m) != "aarch64" ]; then \ - LIBS=$(./scripts/list_needed_libs.sh) && \ - staticx $LIBS dist/gprofiler dist/gprofiler ; \ - fi + source scl_source enable devtoolset-8 llvm-toolset-7 ; \ + fi && \ + LIBS=$(./scripts/list_needed_libs.sh) && \ + staticx $LIBS dist/gprofiler dist/gprofiler FROM scratch AS export-stage From 08912f0c195fff2019c7e1c37c82d23064aba9af Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Sun, 18 Jun 2023 19:03:11 +0300 Subject: [PATCH 2/8] bump version --- gprofiler/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gprofiler/__init__.py b/gprofiler/__init__.py index 61105063e..88a9c66e7 100644 --- a/gprofiler/__init__.py +++ b/gprofiler/__init__.py @@ -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-rc1" From 465ad997f1db657ac198b77179cf6fc69dceadbc Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Mon, 19 Jun 2023 06:41:23 +0300 Subject: [PATCH 3/8] rm scl_source --- pyi.Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 78205082d..3d92ed63b 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -290,9 +290,6 @@ COPY ./scripts/list_needed_libs.sh ./scripts/list_needed_libs.sh # using scl here to get the proper LD_LIBRARY_PATH set # hadolint ignore=SC2046,SC2086 RUN set -e; \ - if [ $(uname -m) != "aarch64" ]; then \ - source scl_source enable devtoolset-8 llvm-toolset-7 ; \ - fi && \ LIBS=$(./scripts/list_needed_libs.sh) && \ staticx $LIBS dist/gprofiler dist/gprofiler From f8ab11ab20b4646156ca28131735f03682a0114e Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Mon, 19 Jun 2023 06:54:48 +0300 Subject: [PATCH 4/8] fix version --- gprofiler/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gprofiler/__init__.py b/gprofiler/__init__.py index 88a9c66e7..de8b9205a 100644 --- a/gprofiler/__init__.py +++ b/gprofiler/__init__.py @@ -1,5 +1,6 @@ + # # Copyright (c) Granulate. All rights reserved. # Licensed under the AGPL3 License. See LICENSE.md in the project root for license information. # -__version__ = "1.30.0-rc1" +__version__ = "1.30.0-test-static-arm" From a7f2422f80ad85c959d4fbb4bded205560e86040 Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Tue, 20 Jun 2023 02:55:29 +0300 Subject: [PATCH 5/8] rename staticx output --- gprofiler/__init__.py | 1 - pyi.Dockerfile | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gprofiler/__init__.py b/gprofiler/__init__.py index de8b9205a..9cc5acfba 100644 --- a/gprofiler/__init__.py +++ b/gprofiler/__init__.py @@ -1,4 +1,3 @@ - # # Copyright (c) Granulate. All rights reserved. # Licensed under the AGPL3 License. See LICENSE.md in the project root for license information. diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 3d92ed63b..9797ec886 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -287,12 +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 RUN set -e; \ LIBS=$(./scripts/list_needed_libs.sh) && \ - staticx $LIBS dist/gprofiler dist/gprofiler + 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 From 0be527d787cca44e1090f05a2228513a5a1ba3a8 Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Tue, 20 Jun 2023 03:19:04 +0300 Subject: [PATCH 6/8] remove hadolint ignore --- pyi.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 9797ec886..56b1a497a 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -287,7 +287,6 @@ 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. -# hadolint ignore=SC2046,SC2086 RUN set -e; \ LIBS=$(./scripts/list_needed_libs.sh) && \ staticx $LIBS dist/gprofiler dist/gprofiler.static From 0e809ac5196806c3e53cbd415bcddc59a84bfb31 Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Tue, 20 Jun 2023 03:31:10 +0300 Subject: [PATCH 7/8] version --- gprofiler/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gprofiler/__init__.py b/gprofiler/__init__.py index 9cc5acfba..fa767d4fb 100644 --- a/gprofiler/__init__.py +++ b/gprofiler/__init__.py @@ -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.30.0-test-static-arm" +__version__ = "1.30.0" From ccfc58460d4d9687a6010516a631a5a0d05b02f7 Mon Sep 17 00:00:00 2001 From: David Dorfman Date: Tue, 20 Jun 2023 04:12:03 +0300 Subject: [PATCH 8/8] re-add ignore for SC2086 --- pyi.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 56b1a497a..55e596bb0 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -287,6 +287,7 @@ 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. +# hadolint ignore=SC2086 RUN set -e; \ LIBS=$(./scripts/list_needed_libs.sh) && \ staticx $LIBS dist/gprofiler dist/gprofiler.static