From 780b3bbcdf0c8cbddebf5acaa6791010e282061a Mon Sep 17 00:00:00 2001
From: Danny Avila <messagedaniel@protonmail.com>
Date: Sat, 15 Jun 2024 11:49:32 -0400
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=8B=20ci:=20adjust=20docker?=
 =?UTF-8?q?=20workflow=20(#43)"=20(#46)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f202734705fc346950088fb6619a0b4ff7a8c270.
---
 .github/workflows/docker-build-workflow.yaml |  7 ++-
 .github/workflows/images.yaml                | 53 ++++++++++++++++++--
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build-workflow.yaml b/.github/workflows/docker-build-workflow.yaml
index 116bc99..f9b9a71 100644
--- a/.github/workflows/docker-build-workflow.yaml
+++ b/.github/workflows/docker-build-workflow.yaml
@@ -52,8 +52,11 @@ jobs:
           context: .
           file: ${{ matrix.file }}
           push: true
+          # tags: |
+          #   ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }}
+          #   ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ inputs.tag }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }}
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ inputs.tag }}
+            ghcr.io/denispalnitsky/${{ matrix.image_name }}:${{ github.sha }}
+            ghcr.io/denispalnitsky/${{ matrix.image_name }}:${{ inputs.tag }}
           platforms: linux/amd64,linux/arm64
           target: ${{ matrix.target }}
\ No newline at end of file
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index bfc5743..9c0d7ba 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -7,10 +7,53 @@ on:
       - 'README.md'
     branches:
       - main
-    
 
 jobs:
-  call-docker-build:
-    uses: ./.github/workflows/docker-build-workflow.yaml
-    with:
-      tag: latest
\ No newline at end of file
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        include:
+          - target: main
+            file: Dockerfile
+            image_name: librechat-rag-api-dev
+          - target: lite
+            file: Dockerfile.lite
+            image_name: librechat-rag-api-dev-lite
+
+    steps:
+      # Check out the repository
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Set up QEMU
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      # Set up Docker Buildx
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Log in to GitHub Container Registry
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build and push Docker images for each target
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.file }}
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:latest
+          platforms: linux/amd64,linux/arm64
+          target: ${{ matrix.target }}