diff --git a/.github/workflows/alphaRelease.yml b/.github/workflows/alphaRelease.yml index 84ce27f73..206c93365 100644 --- a/.github/workflows/alphaRelease.yml +++ b/.github/workflows/alphaRelease.yml @@ -1,8 +1,6 @@ name: alphaRelease on: - push: - branches: [ develop ] pull_request: branches: [ develop ] @@ -15,6 +13,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -29,7 +30,7 @@ jobs: uses: docker/build-push-action@v2 with: file: ./SmartTeslaAmpSetter/Server/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: pkuehnel/smartteslaampsetter:alpha @@ -41,6 +42,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -55,6 +59,6 @@ jobs: uses: docker/build-push-action@v2 with: file: ./Plugins.SmaEnergymeter/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: pkuehnel/smartteslaampsettersmaplugin:alpha diff --git a/.github/workflows/edgeRelease.yml b/.github/workflows/edgeRelease.yml index 066cfdd3e..43f5581c8 100644 --- a/.github/workflows/edgeRelease.yml +++ b/.github/workflows/edgeRelease.yml @@ -15,6 +15,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -29,7 +32,7 @@ jobs: uses: docker/build-push-action@v2 with: file: ./SmartTeslaAmpSetter/Server/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: pkuehnel/smartteslaampsetter:edge @@ -41,6 +44,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -55,6 +61,6 @@ jobs: uses: docker/build-push-action@v2 with: file: ./Plugins.SmaEnergymeter/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: pkuehnel/smartteslaampsettersmaplugin:edge diff --git a/.github/workflows/versionRelease.yml b/.github/workflows/versionRelease.yml index be7a7456b..9cc8c6e1c 100644 --- a/.github/workflows/versionRelease.yml +++ b/.github/workflows/versionRelease.yml @@ -8,7 +8,7 @@ jobs: name: Release strategy: matrix: - kind: ['linux-x64', 'linux-arm64'] + kind: ['linux-x64', 'linux-arm64','linux/arm/v7'] include: - kind: linux-x64 os: ubuntu-latest @@ -16,11 +16,17 @@ jobs: - kind: linux-arm64 os: ubuntu-latest target: linux-arm64 + - kind: linux/arm/v7 + os: ubuntu-latest + target: linux/arm/v7 runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Setup dotnet uses: actions/setup-dotnet@v1 with: @@ -70,71 +76,74 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - # list of Docker images to use as base name for tags - images: | - pkuehnel/smartteslaampsetter - # generate Docker tags based on the following events/attributes - tags: | - type=semver,pattern={{version}} - - - name: Buildx - id: buildx - uses: docker/setup-buildx-action@v1 - - - name: DockerHub login - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASS}} - - - name: Build and push SmartTeslaAmpSetter - uses: docker/build-push-action@v2 - with: - file: ./SmartTeslaAmpSetter/Server/Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + pkuehnel/smartteslaampsetter + # generate Docker tags based on the following events/attributes + tags: | + type=semver,pattern={{version}} + + - name: Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: DockerHub login + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASS}} + + - name: Build and push SmartTeslaAmpSetter + uses: docker/build-push-action@v2 + with: + file: ./SmartTeslaAmpSetter/Server/Dockerfile + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.meta.outputs.tags }} releaseDockerLatestSmaEnergymeterplugin: name: Building SMAPlugin Image runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - # list of Docker images to use as base name for tags - images: | - pkuehnel/smartteslaampsettersmaplugin - # generate Docker tags based on the following events/attributes - tags: | - type=semver,pattern={{version}} - - - name: Buildx - id: buildx - uses: docker/setup-buildx-action@v1 - - - name: DockerHub login - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASS}} - - - name: Build and push SmaPlugin - uses: docker/build-push-action@v2 - with: - file: ./Plugins.SmaEnergymeter/Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} \ No newline at end of file + - name: Checkout + uses: actions/checkout@v2 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + pkuehnel/smartteslaampsettersmaplugin + # generate Docker tags based on the following events/attributes + tags: | + type=semver,pattern={{version}} + + - name: Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: DockerHub login + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASS}} + + - name: Build and push SmaPlugin + uses: docker/build-push-action@v2 + with: + file: ./Plugins.SmaEnergymeter/Dockerfile + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.meta.outputs.tags }} \ No newline at end of file diff --git a/Plugins.SmaEnergymeter/Dockerfile b/Plugins.SmaEnergymeter/Dockerfile index eadce0104..a2c03f1f0 100644 --- a/Plugins.SmaEnergymeter/Dockerfile +++ b/Plugins.SmaEnergymeter/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-amd64 AS build WORKDIR /src COPY ["Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj", "Plugins.SmaEnergymeter/"] RUN dotnet restore "Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj" diff --git a/SmartTeslaAmpSetter/Server/Dockerfile b/SmartTeslaAmpSetter/Server/Dockerfile index 2725e52fc..a605a1e81 100644 --- a/SmartTeslaAmpSetter/Server/Dockerfile +++ b/SmartTeslaAmpSetter/Server/Dockerfile @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-amd64 AS build WORKDIR /src COPY ["SmartTeslaAmpSetter/Server/SmartTeslaAmpSetter.Server.csproj", "SmartTeslaAmpSetter/Server/"] COPY ["SmartTeslaAmpSetter/Client/SmartTeslaAmpSetter.Client.csproj", "SmartTeslaAmpSetter/Client/"]