Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux improvements #179

Merged
merged 2 commits into from
Oct 26, 2018
Merged

linux improvements #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71d4a4
update version, add integrations.json
dd-caleb Oct 26, 2018
56e1770
support alpine linux
dd-caleb Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/dotnet.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM microsoft/dotnet:2.1-sdk
FROM microsoft/dotnet:2.1-sdk-alpine

RUN apk add bash libc6-compat

ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /bin/wait-for-it
RUN chmod +x /bin/wait-for-it

RUN apt-get update && apt-get install -y colortail
8 changes: 5 additions & 3 deletions docker/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
set -euxo pipefail

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
VERSION=0.4.0
VERSION=0.4.1

mkdir -p $DIR/../deploy/linux
cp $DIR/../integrations.json $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/

cd $DIR/../deploy/linux
for pkgtype in deb rpm tar ; do
Expand All @@ -14,9 +15,10 @@ for pkgtype in deb rpm tar ; do
-t $pkgtype \
-n datadog-dotnet-apm \
-v $VERSION \
--prefix /opt/datadog \
$(if [ $pkgtype != 'tar' ] ; then echo --prefix /opt/datadog ; fi) \
--chdir $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64 \
Datadog.Trace.ClrProfiler.Native.so
Datadog.Trace.ClrProfiler.Native.so \
integrations.json
done

gzip -f datadog-dotnet-apm.tar
Expand Down
2 changes: 2 additions & 0 deletions src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ target_include_directories("Datadog.Trace.ClrProfiler.Native.static"
)
target_link_libraries("Datadog.Trace.ClrProfiler.Native.static"
/opt/re2/obj/libre2.a
-static-libgcc
-static-libstdc++
)

add_library("Datadog.Trace.ClrProfiler.Native" SHARED
Expand Down