File tree Expand file tree Collapse file tree 5 files changed +20
-8
lines changed Expand file tree Collapse file tree 5 files changed +20
-8
lines changed Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ COPY scripts/phpspy_build.sh .
4646RUN ./phpspy_build.sh
4747
4848# async-profiler
49+ # requires CentOS 6, so the built DSO can be loaded into machines running with old glibc.
4950# centos:6
5051FROM centos@sha256:dec8f471302de43f4cfcf82f56d99a5227b5ea1aa6d02fa56344986e1f4610e7 AS async-profiler-builder
5152COPY scripts/async_profiler_env.sh .
Original file line number Diff line number Diff line change 1- __version__ = "1.1.4 "
1+ __version__ = "1.1.6 "
Original file line number Diff line number Diff line change @@ -35,6 +35,8 @@ COPY scripts/phpspy_build.sh .
3535RUN ./phpspy_build.sh
3636
3737# async-profiler
38+ # requires CentOS 6, so the built DSO can be loaded into machines running with old glibc.
39+ # centos:6
3840FROM centos@sha256:dec8f471302de43f4cfcf82f56d99a5227b5ea1aa6d02fa56344986e1f4610e7 AS async-profiler-builder
3941COPY scripts/async_profiler_env.sh .
4042RUN ./async_profiler_env.sh
Original file line number Diff line number Diff line change 55#
66set -euo pipefail
77
8- VERSION=v2.0g3
8+ VERSION=v2.0g4
9+ GIT_REV=9d29169e34abc004f534a85ba6a4cf8920250381
910OUTPUT=async-profiler-2.0-linux-x64.tar.gz
1011
11- git clone --depth 1 -b " $VERSION " https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard 51447a849d686e899c1cd393e83f0f7c41685d95
12+ git clone --depth 1 -b " $VERSION " https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard " $GIT_REV "
13+ set +eu # this funny script has errors :shrug:
14+ source scl_source enable devtoolset-7
15+ set -eu
1216make release
1317
1418# add a version file to the build directory
Original file line number Diff line number Diff line change 55#
66set -euo pipefail
77
8- # fix legacy yum repos. slightly adapted from https://stackoverflow.com/a/53848450
9- # this basically comments out all mirrorlist URLs, uncomments all baseurls (all seem to be commented)
10- # and replaces the domain from mirror.centos.org to vault.centos.org.
11- sed -i -e ' s|^mirrorlist|#mirrorlist|' -e ' s|^# *baseurl|baseurl|' -e ' s|mirror.centos.org|vault.centos.org|' /etc/yum.repos.d/*
8+ function fix_legacy_repos() {
9+ # fix legacy yum repos. slightly adapted from https://stackoverflow.com/a/53848450
10+ # this basically comments out all mirrorlist URLs, uncomments all baseurls (all seem to be commented)
11+ # and replaces the domain from mirror.centos.org to vault.centos.org.
12+ sed -i -e ' s|^mirrorlist|#mirrorlist|' -e ' s|^# *baseurl|baseurl|' -e ' s|mirror.centos.org|vault.centos.org|' /etc/yum.repos.d/*
13+ }
1214
13- yum install -y gcc g++ gcc-c++.x86_64 make java-1.8.0-openjdk-devel glibc-static git
15+ fix_legacy_repos
16+ yum install -y centos-release-scl
17+ fix_legacy_repos # fix again, after adding new scl repos
18+ yum install -y devtoolset-7-toolchain make java-1.8.0-openjdk-devel glibc-static git
You can’t perform that action at this time.
0 commit comments