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.

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

Update dotnet-install.sh sha256sum #740

Closed
wants to merge 14 commits into from
Closed
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ jobs:
continue-on-error: true

container-integration-tests:
name: Container Integration tests
name: Container Integration tests
strategy:
fail-fast: false
matrix:
Expand All @@ -390,6 +390,16 @@ jobs:
5.0.408
6.0.404
7.0.101

- name: Disk usage before removing images
run: df -h

- name: Remove large node images
run: docker rmi node:20 node:18 node:16

- name: Disk usage after removing images
run: df -h

- name: Build Docker image
run: |
docker build \
Expand All @@ -409,7 +419,7 @@ jobs:
dd-trace-dotnet/${{ matrix.base-image }}-builder \
dotnet /build/bin/Debug/_build.dll Info Clean BuildTracerHome BuildLinuxIntegrationTests -Framework ${{ matrix.framework }}
- name: Build dependencies
run: docker-compose build --build-arg SERVERLESS_ARTIFACTS_PATH=.${relativeTracerHome} serverless-lambda-no-param-sync serverless-lambda-one-param-sync serverless-lambda-two-params-sync serverless-lambda-no-param-async serverless-lambda-one-param-async serverless-lambda-two-params-async serverless-lambda-no-param-void serverless-lambda-one-param-void serverless-lambda-two-params-void
run: docker-compose build --build-arg SERVERLESS_ARTIFACTS_PATH=.${relativeTracerHome} StartDependencies
- name: Start dependencies
run: docker-compose up -d StartDependencies
- name: Run integration tests in container
Expand Down
16 changes: 1 addition & 15 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -617,23 +617,9 @@ services:
- kafka-zookeeper
- aws_sqs
- couchbase
- serverless-lambda-no-param-sync
- serverless-lambda-one-param-sync
- serverless-lambda-two-params-sync
- serverless-lambda-no-param-sync-with-context
- serverless-lambda-one-param-sync-with-context
- serverless-lambda-two-params-sync-with-context
- serverless-lambda-no-param-async
- serverless-lambda-one-param-async
- serverless-lambda-two-params-async
- serverless-lambda-no-param-void
- serverless-lambda-one-param-void
- serverless-lambda-two-params-void
- serverless-integration-extension-mock
- serverless-integration-extension-mock-with-context
environment:
- TIMEOUT_LENGTH=120
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324 couchbase:11210 serverless-lambda-no-param-sync:8080 serverless-lambda-one-param-sync:8080 serverless-lambda-two-params-sync:8080 serverless-lambda-no-param-sync-with-context:8080 serverless-lambda-one-param-sync-with-context:8080 serverless-lambda-two-params-sync-with-context:8080 serverless-lambda-no-param-async:8080 serverless-lambda-one-param-async:8080 serverless-lambda-two-params-async:8080 serverless-integration-extension-mock:9003 serverless-integration-extension-mock-with-context:9004 serverless-lambda-no-param-void:8080 serverless-lambda-one-param-void:8080 serverless-lambda-two-params-void:8080
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324 couchbase:11210

IntegrationTests.ARM64:
build:
Expand Down
2 changes: 1 addition & 1 deletion tracer/build/_build/docker/alpine.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ FROM base as tester
# Install .NET Core runtimes using install script
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --runtime aspnetcore --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
Expand Down
6 changes: 3 additions & 3 deletions tracer/build/_build/docker/debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update \
git=1:2.20.1-2+deb10u3 \
procps=2:3.3.15-2 \
wget=1.20.1-1.1 \
curl=7.64.0-4+deb10u6 \
curl=7.64.0-4+deb10u7 \
cmake=3.13.4-1 \
make=4.2.1-1.2 \
llvm=1:7.0-47 \
Expand All @@ -46,7 +46,7 @@ RUN apt-get update \
# Install the .NET SDK
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --version $DOTNETSDK_VERSION --install-dir /usr/share/dotnet \
&& rm ./dotnet-install.sh \
Expand Down Expand Up @@ -79,7 +79,7 @@ RUN if [ "$(uname -m)" = "x86_64" ]; \
fi \
&& curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --runtime $NETCORERUNTIME2_1 --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
Expand Down
155 changes: 0 additions & 155 deletions tracer/test/Datadog.Trace.Tests/ServerlessTests.cs

This file was deleted.

Loading