Merge remote-tracking branch 'origin/main'

.gitlab-ci.yml

@@ -14,13 +14,14 @@ docker-build:
   variables:
     DOCKER_HOST: tcp://docker:2375
     DOCKER_TLS_CERTDIR: ""
-    DOCKER_BUILDKIT: 1
-    COMPOSE_DOCKER_CLI_BUILD: 1
+    #DOCKER_BUILDKIT: 1
+    #COMPOSE_DOCKER_CLI_BUILD: 1
   before_script:
     - docker info
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - docker compose build --pull --build-arg BUILDKIT_INLINE_CACHE=1
+    #- docker compose build --pull --build-arg BUILDKIT_INLINE_CACHE=1
+    - docker compose build --pull --no-cache
     - docker compose push
 
 helm-package: