adding arm image, removing redundant line

This commit is contained in:
Andy Pack 2023-05-16 17:40:13 +01:00
parent 66d39abedd
commit 0adc052dc6
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
3 changed files with 10 additions and 4 deletions

View File

@ -10,6 +10,8 @@
*.userosscache *.userosscache
*.sln.docstates *.sln.docstates
**/appsettings.Development.json
# User-specific files (MonoDevelop/Xamarin Studio) # User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs *.userprefs

View File

@ -49,13 +49,16 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master' if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v2
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
@ -64,6 +67,7 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
push: true push: true
platforms: linux/amd64,linux/arm64
tags: sarsoo/selector-cli:latest tags: sarsoo/selector-cli:latest
file: Dockerfile.CLI file: Dockerfile.CLI
@ -71,6 +75,7 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
push: true push: true
platforms: linux/amd64,linux/arm64
tags: sarsoo/selector-web:latest tags: sarsoo/selector-web:latest
file: Dockerfile.Web file: Dockerfile.Web

View File

@ -23,7 +23,6 @@ COPY . ./
FROM base as publish FROM base as publish
COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/ COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/
RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app
FROM mcr.microsoft.com/dotnet/aspnet:7.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0