From 76f62eb0a1d511f292e58675aa56edcdc387a21b Mon Sep 17 00:00:00 2001
From: Lev <mail@vrslev.com>
Date: Tue, 23 Nov 2021 17:25:32 +0300
Subject: [PATCH] update

---
 .github/workflows/build_stable.yml | 72 +++++++++++++-----------------
 docker-bake.hcl                    | 19 ++++++++
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index 6d5ad7f3..f61bae91 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -35,13 +35,17 @@ env:
   IS_AUTHORIZED_RUN: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
 
 jobs:
-  build_frappe:
-    name: Frappe
+  build:
+    name: Frappe and ERPNext
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     strategy:
       matrix:
         version: [12, 13]
-
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -61,14 +65,36 @@ jobs:
         env:
           VERSION: ${{ matrix.version }}
 
-      - name: Build
+      - name: Build Frappe
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
           targets: frappe-stable-test
           load: true
 
-      - name: Push
+      - name: Push Frappe to local registry
+        uses: docker/bake-action@v1.6.0
+        with:
+          files: docker-bake.hcl
+          targets: frappe-stable-test-local
+          push: true
+
+      - name: Test Frappe
+        if: github.event_name == 'pull_request'
+        run: ./tests/test-frappe.sh
+
+      - name: Build ERPNext
+        uses: docker/bake-action@v1.6.0
+        with:
+          files: docker-bake.hcl
+          targets: erpnext-stable-test
+          load: true
+
+      - name: Test ERPNext
+        if: github.event_name == 'pull_request'
+        run: ./tests/test-erpnext.sh
+
+      - name: Push Frappe
         if: env.IS_AUTHORIZED_RUN == 'true'
         uses: docker/bake-action@v1.6.0
         with:
@@ -78,41 +104,7 @@ jobs:
         env:
           GIT_TAG: ${{ env.FRAPPE_VERSION }}
 
-  build_erpnext:
-    name: ERPNext
-    runs-on: ubuntu-latest
-    needs: build_frappe
-    strategy:
-      matrix:
-        version: [12, 13]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login
-        uses: docker/login-action@v1
-        if: env.IS_AUTHORIZED_RUN == 'true'
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Get latest versions
-        run: ./.github/scripts/get-latest-tags.sh
-        env:
-          VERSION: ${{ matrix.version }}
-
-      - name: Build
-        uses: docker/bake-action@v1.6.0
-        with:
-          files: docker-bake.hcl
-          targets: erpnext-stable-test
-          load: true
-
-      - name: Push
+      - name: Push ERPNext
         if: env.IS_AUTHORIZED_RUN == 'true'
         uses: docker/bake-action@v1.6.0
         with:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 85a14c28..2adda979 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -219,6 +219,21 @@ group "erpnext-stable" {
 
 # Test stable images
 
+target "frappe-nginx-stable-test-local" {
+    inherits = ["frappe-nginx-stable"]
+    tags = set_local_test_tags("frappe/frappe-nginx")
+}
+
+target "frappe-worker-stable-test-local" {
+    inherits = ["frappe-worker-stable"]
+    tags = set_local_test_tags("frappe/frappe-worker")
+}
+
+target "frappe-socketio-stable-test-local" {
+    inherits = ["frappe-socketio-stable"]
+    tags = set_local_test_tags("frappe/frappe-socketio")
+}
+
 target "frappe-nginx-stable-test" {
     inherits = ["frappe-nginx-stable"]
     tags = set_test_tags("frappe/frappe-nginx")
@@ -244,6 +259,10 @@ target "erpnext-worker-stable-test" {
     tags = set_test_tags("frappe/erpnext-worker")
 }
 
+group "frappe-stable-test-local" {
+    targets = ["frappe-nginx-stable-test-local", "frappe-worker-stable-test-local", "frappe-socketio-stable-test-local"]
+}
+
 group "frappe-stable-test" {
     targets = ["frappe-nginx-stable-test", "frappe-worker-stable-test", "frappe-socketio-stable-test"]
 }