Update build.yaml

Author: jeffmaki

.github/workflows/build.yaml

@@ -39,17 +39,42 @@ jobs:
             restore-keys: |
               ${{ runner.os }}-buildx-app                        
 
-        - name: Prepare for buildx
+ #       - name: Prepare for buildx
+ #         run: | 
+ #           cp tdei_uw.env .env
+ #             echo "CODE_VERSION=${CODE_VERSION}" >> .env
+        
+#        - name: Build and push
+#          uses: docker/[email protected]
+#          env:
+#              ENV: ${{ vars.ENV }}
+#              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
+#    
+#              # passwords
+#              WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
+#              WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
+#              WS_OSM_DB_PASS: ${{ secrets.WS_OSM_DB_PASS }}
+#              WS_OSM_SECRET_KEY_BASE: ${{ secrets.WS_OSM_SECRET_KEY_BASE }}
+#              WS_SMTP_PASS: ${{ secrets.WS_SMTP_PASS }}
+#              WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
+#              WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
+#          with:
+#            files: docker-buildx.build.hcl
+#            push: true
+#            set: |
+#              *.cache-from=type=local,src=/tmp/.buildx-cache
+#              *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new
+#            allow: "fs=/tmp"
+                                     
+        - name: Build and push
           run: | 
             cp tdei_uw.env .env
               echo "CODE_VERSION=${CODE_VERSION}" >> .env
-        
-        - name: Build and push
-          uses: docker/[email protected]
+              docker buildx bake --allow=fs=/tmp --file docker-buildx.build.hcl --set *.cache-from=type=local,src=/tmp/.buildx-cache --set *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new --push                                 
           env:
               ENV: ${{ vars.ENV }}
               WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
-    
+         
               # passwords
               WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
               WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
@@ -58,31 +83,6 @@ jobs:
               WS_SMTP_PASS: ${{ secrets.WS_SMTP_PASS }}
               WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
               WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
-          with:
-            files: docker-buildx.build.hcl
-            push: true
-            set: |
-              *.cache-from=type=local,src=/tmp/.buildx-cache
-              *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new
-            allow: "fs=/tmp"
-                                     
-        #- name: Build and push
-        #  run: | 
-        #    cp tdei_uw.env .env
-        #      echo "CODE_VERSION=${CODE_VERSION}" >> .env
-        #      docker buildx bake -f docker-compose.build.yml --push #--set '*.cache-from=type=local,src=/tmp/.buildx-cache-app' --set #'*.cache-to=type=local,dest=/tmp/.buildx-cache-app-new,mode=max' --allow=fs=/tmp                                  
-        #  env:
-        #      ENV: ${{ vars.ENV }}
-        #      WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
-        # 
-        #      # passwords
-        #      WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
-        #      WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
-        #      WS_OSM_DB_PASS: ${{ secrets.WS_OSM_DB_PASS }}
-        #      WS_OSM_SECRET_KEY_BASE: ${{ secrets.WS_OSM_SECRET_KEY_BASE }}
-        #      WS_SMTP_PASS: ${{ secrets.WS_SMTP_PASS }}
-        #      WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
-        #      WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
 
         - name: Prepare cache
           run: |