Align examples with manifest.json variants

* Dockerfile: Remove whitespace * workflows: Remove redundant step
AxisCommunications · Apr 19, 2024 · 2f834ac · 2f834ac
1 parent 06e1ed4
commit 2f834ac
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/object-detection-cv25.yml b/.github/workflows/object-detection-cv25.yml
@@ -30,7 +30,6 @@ jobs:
         run: |
           docker image rm -f $imagetag
           cd $EXNAME
-          cp app/manifest.json.${{ matrix.chip }} app/manifest.json
           docker build --no-cache --tag $imagetag .
           docker cp $(docker create $imagetag):/opt/app ./build_${{ matrix.chip }}
           cd ..

diff --git a/.github/workflows/object-detection.yml b/.github/workflows/object-detection.yml
@@ -36,7 +36,6 @@ jobs:
         run: |
           docker image rm -f $imagetag
           cd $EXNAME
-          cp app/manifest.json.${{ matrix.chip }} app/manifest.json
           docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
           docker cp $(docker create $imagetag):/opt/app ./build_${{ matrix.chip }}
           cd ..

diff --git a/.github/workflows/vdo-larod.yml b/.github/workflows/vdo-larod.yml
@@ -39,7 +39,6 @@ jobs:
         run: |
           docker image rm -f $imagetag
           cd $EXNAME
-          cp app/manifest.json.${{ matrix.chip }} app/manifest.json
           docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
           docker cp $(docker create $imagetag):/opt/app ./build_${{ matrix.chip }}
           cd ..

diff --git a/object-detection/Dockerfile b/object-detection/Dockerfile
@@ -36,8 +36,8 @@ WORKDIR /opt/app/lib
 RUN cp ${BUILD_DIR_JPEG}/build/*.so* .
 WORKDIR /opt/app/include
 RUN cp ${BUILD_DIR_JPEG}/build/*.h . && \
-    cp ${BUILD_DIR_JPEG}/*.h . 
-    
+    cp ${BUILD_DIR_JPEG}/*.h .
+
 WORKDIR /opt/app
 COPY ./app /opt/app/
 

diff --git a/vdo-larod/Dockerfile b/vdo-larod/Dockerfile
@@ -20,9 +20,9 @@ RUN if [ "$CHIP" = artpec8 ]; then \
     elif [ "$CHIP" = cpu ]; then \
         curl -o model.zip $MODEL_BUCKET/models.aarch64.artpec8.zip ; \
     elif [ "$CHIP" = edgetpu ]; then \
-        curl -o model.zip $MODEL_BUCKET/models.armv7hf.edgetpu.zip ; \    
+        curl -o model.zip $MODEL_BUCKET/models.armv7hf.edgetpu.zip ; \
     elif [ "$CHIP" = cv25 ]; then \
-        curl -o model.zip $MODEL_BUCKET/tensorflow_to_larod_models.cv25.zip ; \        
+        curl -o model.zip $MODEL_BUCKET/tensorflow_to_larod_models.cv25.zip ; \
     else \
         printf "Error: '%s' is not a valid value for the CHIP variable\n", "$CHIP"; \
         exit 1; \