- Devel docker repair.

Author: general-kroll-4-life

.github/workflows/build.yml

@@ -28,6 +28,7 @@ env:
   GH_ACCESS_TOKEN: ${{ secrets.ACTIONS_PRIVATE_PACKAGE_SECRET }}
   PLANCACHEENABLED: "true"
   CI_IS_EXPRESS: ${{ github.ref_type == 'tag' && contains(github.ref_name, 'express') && 'true' || 'false' }}
+  STACKQL_IMAGE_NAME: ${{ vars.STACKQL_IMAGE_NAME != '' && vars.STACKQL_IMAGE_NAME || (github.repository == 'stackql/stackql' ||  github.repository == 'stackql/stackql-devel') && github.repository || 'stackql/stackql' }}
 
 jobs:
 
@@ -1168,7 +1169,6 @@ jobs:
     
     - name: Build Stackql image with buildx
       uses: docker/build-push-action@v5
-      if: ${{ (github.repository == 'stackql/stackql' ||  github.repository == 'stackql/stackql-devel') }}
       with:
         context: .
         build-args: |
@@ -1179,13 +1179,15 @@ jobs:
         target: app
         no-cache: ${{ vars.CI_DOCKER_BUILD_NO_CACHE == 'true' && true || false }}
         load: true
-        tags: ${{ github.repository }}:${{github.sha}},${{ github.repository }}:v${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}},${{ github.repository }}:latest
+        tags: ${{ env.STACKQL_IMAGE_NAME }}:${{github.sha}},${{ env.STACKQL_IMAGE_NAME }}:v${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}},${{ env.STACKQL_IMAGE_NAME }}:latest
 
     - name: Debug info
       run: |
         echo "psql version info: $(psql --version)"
         echo ""
-        echo "docker-compose version info: $(docker-compose -version)"
+        echo "docker-compose version info: $(docker compose -version)"
+        echo ""
+        echo "docker images: $(docker images)"
         echo ""
         echo "robot version info: $(robot --version)"
         echo ""
@@ -1283,5 +1285,5 @@ jobs:
           RUN_INTEGRATION_TESTS=0
         push: true
         target: app
-        tags: ${{ github.repository }}:${{github.sha}},${{ github.repository }}:v${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}},${{ github.repository }}:latest
+        tags: ${{ env.STACKQL_IMAGE_NAME }}:${{github.sha}},${{ env.STACKQL_IMAGE_NAME }}:v${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}},${{ env.STACKQL_IMAGE_NAME }}:latest
 

docker-compose-persist-postgres.yml

@@ -2,11 +2,11 @@ version: "3.9"
 
 services:
   stackqlsrv:
-    image: stackql/stackql
+    image: "${STACKQL_IMAGE_NAME:-stackql/stackql}"
     build:
       context: .
       cache_from: 
-        - stackql/stackql
+        - "${STACKQL_IMAGE_NAME:-stackql/stackql}"
         - stackql/integration
         - stackql/stackqlsrvcertificates
       args:

docker-compose.yml

@@ -2,11 +2,11 @@ version: "3.9"
 
 services:
   stackqlsrv:
-    image: stackql/stackql
+    image: "${STACKQL_IMAGE_NAME:-stackql/stackql}"
     build:
       context: .
       cache_from: 
-        - stackql/stackql
+        - "${STACKQL_IMAGE_NAME:-stackql/stackql}"
         - stackql/integration
         - stackql/stackqlsrvcertificates
       args: