Update workflow runner.

insight-platform · Jan 24, 2025 · 7ee4df9 · 7ee4df9
1 parent 854bd35
commit 7ee4df9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 34 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -78,31 +78,21 @@ jobs:
         include:
           - docker_file: docker/Dockerfile.deepstream
             docker_image_suffix: deepstream
-            arch: linux/amd64
             runner: X64
           - docker_file: docker/Dockerfile.deepstream
             docker_image_suffix: deepstream-l4t
-            arch: linux/arm64
             runner: ARM64
 
     steps:
       - uses: actions/checkout@v4
 
-      # setup-docker action ---
       - name: Log in to the container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up docker buildx
-        uses: docker/setup-buildx-action@v3
-      # --- setup-docker action
-
       # base image
       - name: Build and push savant-deepstream docker image
         uses: docker/build-push-action@v5
@@ -114,7 +104,6 @@ jobs:
             SAVANT_VERSION=${{ needs.init.outputs.savant-version }}
             SAVANT_RS_VERSION=${{ needs.init.outputs.savant-rs-version }}
             DEEPSTREAM_VERSION=${{ needs.init.outputs.deepstream-version }}
-          platforms: ${{ matrix.arch }}
           target: base
           push: true
 
@@ -129,7 +118,6 @@ jobs:
             SAVANT_VERSION=${{ needs.init.outputs.savant-version }}
             SAVANT_RS_VERSION=${{ needs.init.outputs.savant-rs-version }}
             DEEPSTREAM_VERSION=${{ needs.init.outputs.deepstream-version }}
-          platforms: ${{ matrix.arch }}
           target: adapters
           push: true
 
@@ -144,7 +132,6 @@ jobs:
             SAVANT_VERSION=${{ needs.init.outputs.savant-version }}
             SAVANT_RS_VERSION=${{ needs.init.outputs.savant-rs-version }}
             DEEPSTREAM_VERSION=${{ needs.init.outputs.deepstream-version }}
-          platforms: ${{ matrix.arch }}
           target: ${{ matrix.docker_image_suffix }}-extra
           push: true
 
@@ -164,39 +151,27 @@ jobs:
         include:
           - docker_file: docker/Dockerfile.adapters-gstreamer
             docker_image: savant-adapters-gstreamer
-            arch: linux/amd64
             runner: X64
           - docker_file: docker/Dockerfile.adapters-gstreamer
             docker_image: savant-adapters-gstreamer-l4t
-            arch: linux/arm64
             runner: ARM64
           - docker_file: docker/Dockerfile.adapters-py
             docker_image: savant-adapters-py
-            arch: linux/amd64
             runner: X64
           - docker_file: docker/Dockerfile.adapters-py
             docker_image: savant-adapters-py-l4t
-            arch: linux/arm64
             runner: ARM64
 
     steps:
       - uses: actions/checkout@v4
 
-      # setup-docker action ---
       - name: Log in to the container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up docker buildx
-        uses: docker/setup-buildx-action@v3
-      # --- setup-docker action
-
       - name: Build and push docker image
         uses: docker/build-push-action@v5
         with:
@@ -207,7 +182,6 @@ jobs:
             SAVANT_VERSION=${{ needs.init.outputs.savant-version }}
             SAVANT_RS_VERSION=${{ needs.init.outputs.savant-rs-version }}
             DEEPSTREAM_VERSION=${{ needs.init.outputs.deepstream-version }}
-          platforms: ${{ matrix.arch }}
           push: true
 
   # build watchdog

diff --git a/Makefile b/Makefile
@@ -31,7 +31,6 @@ publish-local-extra: build-extra
 
 build:
 	docker build \
-		--platform $(PLATFORM) \
 		--target base \
 		--build-arg DEEPSTREAM_VERSION=$(DEEPSTREAM_VERSION) \
 		--build-arg SAVANT_RS_VERSION=$(SAVANT_RS_VERSION) \
@@ -40,7 +39,6 @@ build:
 
 build-adapters-deepstream:
 	docker build \
-		--platform $(PLATFORM) \
 		--target adapters \
 		--build-arg DEEPSTREAM_VERSION=$(DEEPSTREAM_VERSION) \
 		--build-arg SAVANT_RS_VERSION=$(SAVANT_RS_VERSION) \
@@ -49,14 +47,12 @@ build-adapters-deepstream:
 
 build-adapters-gstreamer:
 	docker build \
-		--platform $(PLATFORM) \
 		--build-arg SAVANT_RS_VERSION=$(SAVANT_RS_VERSION) \
 		-f docker/Dockerfile.adapters-gstreamer \
 		-t savant-adapters-gstreamer$(PLATFORM_SUFFIX) .
 
 build-adapters-py:
 	docker build \
-		--platform $(PLATFORM) \
 		--build-arg SAVANT_RS_VERSION=$(SAVANT_RS_VERSION) \
 		-f docker/Dockerfile.adapters-py \
 		-t savant-adapters-py$(PLATFORM_SUFFIX) .
@@ -70,7 +66,7 @@ build-watchdog:
 		services/watchdog
 
 build-extra-packages:
-	docker build \
+	docker buildx build --load \
 		--platform $(PLATFORM) \
 		--target extra$(PLATFORM_SUFFIX)-builder \
 		--build-arg DEEPSTREAM_VERSION=$(DEEPSTREAM_VERSION) \
@@ -86,7 +82,6 @@ build-extra-packages:
 
 build-extra:
 	docker build \
-		--platform $(PLATFORM) \
 		--target deepstream$(PLATFORM_SUFFIX)-extra \
 		--build-arg DEEPSTREAM_VERSION=$(DEEPSTREAM_VERSION) \
 		--build-arg SAVANT_RS_VERSION=$(SAVANT_RS_VERSION) \

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -20,7 +20,7 @@
 copyright = '2020-2023 BWSoft Management, LLC'
 # author = 'BWSoft'
 
-favicon_url = 'https://avatars.githubusercontent.com/u/102944477?s=48&v=4'
+html_favicon = 'https://avatars.githubusercontent.com/u/102944477?s=48&v=4'
 
 # The full version, including alpha/beta/rc tags
 from savant import __version__

diff --git a/services/watchdog/requirements/common.txt b/services/watchdog/requirements/common.txt
@@ -1,4 +1,4 @@
-aiohttp~=3.9.5
+aiohttp~=3.11
 aiodocker~=0.22.1
 typing-extensions~=4.12.2
 omegaconf~=2.3.0