Skip to content

Commit f3538db

Browse files
authored
fix: migrate from bitnami kubectl and fix chaos testing image (#270)
Co-authored-by: chgl <5307555+chgl@users.noreply.github.com> [skip ci]
1 parent 9b2ac47 commit f3538db

File tree

3 files changed

+2020
-8
lines changed

3 files changed

+2020
-8
lines changed

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,22 @@ COPY --from=build-test /build/src/FhirPseudonymizer.Tests/coverage .
3838
ENTRYPOINT [ "true" ]
3939

4040
FROM build AS build-stress-test
41-
WORKDIR /build/src/FhirPseudonymizer.StressTests
42-
RUN <<EOF
43-
dotnet build \
44-
--configuration=Release
41+
WORKDIR /build
4542

43+
RUN <<EOF
4644
dotnet publish \
47-
--no-restore \
48-
--no-build \
4945
--configuration=Release \
5046
-a "$TARGETARCH" \
51-
-o /build/publish
47+
-o /build/publish \
48+
src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj
5249
EOF
5350

5451
FROM build AS stress-test
5552
WORKDIR /opt/fhir-pseudonymizer-stress
5653

5754
# https://github.com/hadolint/hadolint/pull/815 isn't yet in mega-linter
5855
# hadolint ignore=DL3022
59-
COPY --from=docker.io/bitnami/kubectl:1.33.3@sha256:cd354d5b25562b195b277125439c23e4046902d7f1abc0dc3c75aad04d298c17 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl
56+
COPY --from=docker.io/rancher/kubectl:v1.34.0@sha256:ff3cdadeac7eae628b59debe73302bb41337098dc3f15dfb3f3c5a59b046d23c /bin/kubectl /usr/bin/kubectl
6057

6158
COPY tests/chaos/chaos.yaml /tmp/
6259
COPY --from=build-stress-test /build/publish .

src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<CodeAnalysisRuleSet>..\..\stylecop.ruleset.xml</CodeAnalysisRuleSet>
5+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
56
</PropertyGroup>
67
<ItemGroup>
78
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />

0 commit comments

Comments
 (0)