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

Fix flaky cartservice build #984

Merged
merged 12 commits into from
Jul 19, 2023
Merged

Fix flaky cartservice build #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c6242b
update dotnet builder version
austinlparker Jul 17, 2023
aa40adf
update docker version
austinlparker Jul 17, 2023
3cae172
fix yaml lint
austinlparker Jul 17, 2023
af040a3
Merge branch 'main' into dotnetUpdateBuilder
austinlparker Jul 17, 2023
2d83450
change builder image
austinlparker Jul 17, 2023
013e9e8
try different qemu container
austinlparker Jul 17, 2023
674c027
disable static web assets entirely
austinlparker Jul 18, 2023
1b1a2a1
fix build issue
austinlparker Jul 18, 2023
e2eccde
Merge branch 'main' into dotnetUpdateBuilder
cartersocha Jul 18, 2023
ab364c1
Merge branch 'main' into dotnetUpdateBuilder
austinlparker Jul 18, 2023
5510674
split stages and increase loglevel
austinlparker Jul 18, 2023
9904b34
Merge branch 'main' into dotnetUpdateBuilder
austinlparker Jul 18, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/build-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ jobs:

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
image: tonistiigi/binfmt:master

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
10 changes: 7 additions & 3 deletions src/cartservice/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

# https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
FROM mcr.microsoft.com/dotnet/sdk:7.0.304 AS builder
FROM mcr.microsoft.com/dotnet/sdk:7.0.306 AS builder

WORKDIR /usr/src/app/

Expand All @@ -25,8 +25,12 @@ COPY ./pb/ ./src/protos/
RUN \
RUNTIME_IDENTIIFER=linux-musl-x64; \
if [ "$(uname -m)" = "aarch64" ]; then RUNTIME_IDENTIIFER=linux-musl-arm64; fi; \
dotnet restore ./src/cartservice.csproj -r $RUNTIME_IDENTIIFER && \
dotnet publish ./src/cartservice.csproj -p:PublishSingleFile=true -r $RUNTIME_IDENTIIFER --self-contained true -p:PublishTrimmed=False -p:TrimMode=Link -c Release -o /cartservice --no-restore
dotnet restore ./src/cartservice.csproj -v d -r $RUNTIME_IDENTIIFER

RUN \
RUNTIME_IDENTIIFER=linux-musl-x64; \
if [ "$(uname -m)" = "aarch64" ]; then RUNTIME_IDENTIIFER=linux-musl-arm64; fi; \
dotnet publish ./src/cartservice.csproj -v d -p:PublishSingleFile=true -r $RUNTIME_IDENTIIFER --self-contained true -p:PublishTrimmed=False -p:TrimMode=Link -c Release -o /cartservice --no-restore

# -----------------------------------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions src/cartservice/src/cartservice.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>

<ItemGroup>
Expand Down