From 1cdc55c8c29cee64bfe7d1b148bed3e930e02783 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:38:24 +0100 Subject: [PATCH] 3.1.1 --- .github/workflows/build-image.yml | 31 +++++++++++++++--------- www/public/resources/styles/motionui.css | 2 +- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 9365622a..e2cd7e49 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -15,23 +15,32 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v4 + with: + ref: 'devel' - name: Retrieve motion-UI version run: | echo "VERSION=$(cat ${GITHUB_WORKSPACE}/www/version)" >> $GITHUB_ENV echo "Version: ${{ env.VERSION }}" - - - name: Log in to Docker Hub - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Log in to the container registry + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - - # Build the image with '$VERSION' and 'latest' tags - - name: Build the image - run: docker build . --file ./docker/Dockerfile --tag lbr38/motionui:${{ env.VERSION }} --tag lbr38/motionui:latest - - name: Push the image - run: | - docker push lbr38/motionui:${{ env.VERSION }} - docker push lbr38/motionui:latest + # Build the images + - name: Build and push docker + uses: docker/build-push-action@v2 + with: + file: ./docker/Dockerfile + push: true + tags: lbr38/motion:latest, lbr38/motion:${{ env.VERSION }} + platforms: linux/amd64,linux/arm64,linux/arm/v7 + \ No newline at end of file diff --git a/www/public/resources/styles/motionui.css b/www/public/resources/styles/motionui.css index dc51d385..7fdb8c07 100644 --- a/www/public/resources/styles/motionui.css +++ b/www/public/resources/styles/motionui.css @@ -535,7 +535,7 @@ footer #github img { width: 25px; } .event-media-row { min-height: 50px; background-color: #182b3e; - border-radius: 4px; + border-radius: 8px; border: 1px solid #213446; margin-bottom: 4px; }