Merge branch 'unprotected-phpunit'

.gitlab-ci.yml

@@ -42,15 +42,8 @@ ttrss-fpm-pgsql-static:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_FPM}
 
-ttrss-fpm-pgsql-static:push-master-commit-only:
-  extends: .crane-image-registry-push-master-commit-only
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_FPM}
-  needs:
-    - job: ttrss-fpm-pgsql-static:build
-
-ttrss-fpm-pgsql-static:push-branch:
-  extends: .crane-image-registry-push-branch
+ttrss-fpm-pgsql-static:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_FPM}
   needs:
@@ -62,15 +55,8 @@ ttrss-web-nginx:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_WEB}
 
-ttrss-web-nginx:push-master-commit-only:
-  extends: .crane-image-registry-push-master-commit-only
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_WEB}
-  needs:
-    - job: ttrss-web-nginx:build
-
-ttrss-web-nginx:push-branch:
-  extends: .crane-image-registry-push-branch
+ttrss-web-nginx:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_WEB}
   needs:
@@ -124,13 +110,16 @@ phpunit-integration:
       name: registry.fakecake.org/docker.io/postgres:15-alpine
       alias: db
     - &svc_app
-      name: registry.fakecake.org/cthulhoo/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
+      name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
       alias: app
     - &svc_web
-      name: registry.fakecake.org/cthulhoo/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
+      name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
       alias: web-nginx
   rules:
-    - if: $CI_COMMIT_BRANCH && $REGISTRY_USER != null
+    - if: $CI_COMMIT_BRANCH
+  needs:
+    - job: ttrss-fpm-pgsql-static:push-commit-only-gitlab
+    - job: ttrss-web-nginx:push-commit-only-gitlab
   before_script:
     # wait for everything to start
     - |