From a2722e16e767b0683998ba6d04053a82068cb5b1 Mon Sep 17 00:00:00 2001
From: yoni13 <yoni980807@gmail.com>
Date: Sat, 11 Jan 2025 10:13:03 +0800
Subject: [PATCH] Revert my changes to dockerfiles

---
 .github/workflows/docker.yml | 51 +++++++++++++++++++++---------------
 machine-learning/Dockerfile  |  5 +---
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4c673c5c09..ec5c24ba56 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,9 +3,9 @@ name: Docker
 on:
   workflow_dispatch:
   push:
-    branches: [rknn-toolkit2]
+    branches: [main]
   pull_request:
-    branches: [rknn-toolkit2]
+    branches: [main]
   release:
     types: [published]
 
@@ -104,9 +104,18 @@ jobs:
         include:
           - platforms: linux/amd64,linux/arm64
             device: cpu
+
+          - platforms: linux/amd64
+            device: cuda
+            suffix: -cuda
+
+          - platforms: linux/amd64
+            device: openvino
+            suffix: -openvino
+
           - platforms: linux/arm64
-            device: rknn
-            suffix: -rknn
+            device: armnn
+            suffix: -armnn
 
     steps:
       - name: Checkout
@@ -118,13 +127,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.8.0
 
-      # - name: Login to Docker Hub
-      #   # Only push to Docker Hub when making a release
-      #   if: ${{ github.event_name == 'release' }}
-      #   uses: docker/login-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to Docker Hub
+        # Only push to Docker Hub when making a release
+        if: ${{ github.event_name == 'release' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -144,7 +153,7 @@ jobs:
             latest=false
           images: |
             name=ghcr.io/${{ github.repository_owner }}/${{env.image}}
-            # name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
+            name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
           tags: |
             # Tag with branch name
             type=ref,event=branch,suffix=${{ matrix.suffix }}
@@ -209,13 +218,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.8.0
 
-      # - name: Login to Docker Hub
-      #   # Only push to Docker Hub when making a release
-      #   if: ${{ github.event_name == 'release' }}
-      #   uses: docker/login-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to Docker Hub
+        # Only push to Docker Hub when making a release
+        if: ${{ github.event_name == 'release' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -235,7 +244,7 @@ jobs:
             latest=false
           images: |
             name=ghcr.io/${{ github.repository_owner }}/${{env.image}}
-            # name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
+            name=altran1502/${{env.image}},enable=${{ github.event_name == 'release' }}
           tags: |
             # Tag with branch name
             type=ref,event=branch,suffix=${{ matrix.suffix }}
@@ -298,4 +307,4 @@ jobs:
         run: exit 1
       - name: All jobs passed or skipped
         if: ${{ !(contains(needs.*.result, 'failure')) }}
-        run: echo "All jobs passed or skipped" && echo "${{ toJSON(needs.*.result) }}"
+        run: echo "All jobs passed or skipped" && echo "${{ toJSON(needs.*.result) }}"
\ No newline at end of file
diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile
index 2a23f274f8..8afe6f0d10 100644
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -8,8 +8,6 @@ FROM builder-cpu AS builder-cuda
 
 FROM builder-cpu AS builder-armnn
 
-FROM builder-cpu AS builder-rknn
-
 ENV ARMNN_PATH=/opt/armnn
 COPY ann /opt/ann
 RUN mkdir /opt/armnn && \
@@ -82,7 +80,6 @@ COPY --from=builder-armnn \
     /opt/ann/build.sh \
     /opt/armnn/
 
-FROM prod-cpu AS prod-rknn
 FROM prod-${DEVICE} AS prod
 ARG DEVICE
 
@@ -112,4 +109,4 @@ COPY app .
 ENTRYPOINT ["tini", "--"]
 CMD ["./start.sh"]
 
-HEALTHCHECK CMD python3 healthcheck.py
+HEALTHCHECK CMD python3 healthcheck.py
\ No newline at end of file