Skip to content

Commit 76ec802

Browse files
Merge pull request #1733 from TransactionProcessing/task/#1732_workflow_tweaks
Update CI workflows and Dockerfile for consistency
2 parents 6a6163e + 42cc595 commit 76ec802

4 files changed

Lines changed: 4 additions & 19 deletions

File tree

.github/workflows/createrelease.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,7 @@ jobs:
2323
run: dotnet restore TransactionProcessor.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
2424

2525
- name: Build Code
26-
run: dotnet build TransactionProcessor.sln --configuration Release
27-
28-
- name: Run Unit Tests
29-
run: |
30-
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
31-
dotnet test "TransactionProcessor.BusinessLogic.Tests\TransactionProcessor.BusinessLogic.Tests.csproj"
32-
dotnet test "TransactionProcessor.ProjectionEngine.Tests\TransactionProcessor.ProjectionEngine.Tests.csproj"
33-
dotnet test "TransactionProcessor.Aggregates.Tests\TransactionProcessor.Aggregates.Tests.csproj"
34-
dotnet test "TransactionProcessor.Tests\TransactionProcessor.Tests.csproj"
26+
run: dotnet build TransactionProcessor.sln --configuration Release
3527

3628
- name: Publish Images to Docker Hub - Pre Release
3729
if: ${{ github.event.release.prerelease == true }}

.github/workflows/nightlybuild.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ jobs:
5050
run: dotnet test "TransactionProcessor.IntegrationTests\TransactionProcessor.IntegrationTests.csproj"
5151

5252
- uses: actions/[email protected]
53-
if: ${{ failure() }}
5453
with:
5554
name: tracelogs
56-
path: /home/txnproc/trace/
55+
path: /home/runner/trace/
5756

5857
- uses: dacbd/create-issue-action@main
5958
if: ${{ failure() }}

.github/workflows/pullrequest.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ jobs:
6262
dotnet test "TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj" --filter Category=PRTest --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=integration-test-results.trx"
6363
6464
- uses: actions/[email protected]
65-
if: ${{ failure() }}
6665
with:
6766
name: tracelogs
68-
path: /home/txnproc/trace/
67+
path: /home/runner/trace/
6968

7069
- name: Publish test results
7170
uses: dorny/test-reporter@v1

TransactionProcessor/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,5 @@ RUN dotnet publish "TransactionProcessor.csproj" -c Release -o /app/publish
2424

2525
FROM base AS final
2626
WORKDIR /app
27-
RUN groupadd --gid 10001 appuser \
28-
&& useradd --uid 10001 --gid appuser --shell /usr/sbin/nologin appuser \
29-
&& mkdir -p /home/txnproc/statements/outbound \
30-
&& chown -R appuser:appuser /home/txnproc
31-
COPY --from=publish --chown=appuser:appuser /app/publish .
32-
USER appuser
27+
COPY --from=publish /app/publish .
3328
ENTRYPOINT ["dotnet", "TransactionProcessor.dll"]

0 commit comments

Comments
 (0)