Jenkinsfile

@@ -22,8 +22,7 @@ pipeline {
         }
         stage('Build Environment') {
             steps {
-                script {
-    
+                script {    
                     docker.build("${DOCKER_IDENTITY}", '-f docker/Dockerfile-jenkins-php .')
                     docker.build("${DOCKER_IDENTITY_NGINX}", '-f docker/Dockerfile-nginx .')
                 }
@@ -68,10 +67,6 @@ pipeline {
                     docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials') {
                         docker.image("${DOCKER_IDENTITY}").push()
                         docker.image("${DOCKER_IDENTITY_NGINX}").push()
-                        if (env.BRANCH_NAME == 'main') {
-                            docker.image("${DOCKER_IDENTITY}").push("latest")
-                            docker.image("${DOCKER_IDENTITY_NGINX}").push("latest")
-                        }
                     }
                 }
             }

docker-compose-deploy.yml

@@ -1,51 +0,0 @@
-services:
-  database:
-    container_name: ogcore-database
-    image: mariadb:10.11
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: ogcore
-      MYSQL_PASSWORD: root
-      MYSQL_USER: admin
-    ports:
-      - 3336:3306
-    volumes:
-      - database_data:/var/lib/mysql
-    networks:
-      - ogcore-network
-
-  nginx:
-    container_name: ogcore-nginx
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile-nginx
-    depends_on:
-      - php
-    ports:
-      - 8080:80
-    volumes:
-      - ./public:/var/www/html/public:cached
-    networks:
-      - ogcore-network
-    image: opengnsys/ogcore-nginx:static
-
-  php:
-    container_name: ogcore-php
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile-jenkins-php
-    depends_on:
-      - database
-    environment:
-      XDEBUG_CLIENT_HOST: 127.17.0.1
-      XDEBUG_CLIENT_PORT: 9003
-      PHP_IDE_CONFIG: serverName=ogcore
-    networks:
-      - ogcore-network
-    image: opengnsys/ogcore-php:static
-
-volumes:
-  database_data:
-
-networks:
-  ogcore-network:

src/Controller/UDS/OrganizationalUnitController.php

@@ -95,7 +95,9 @@ class OrganizationalUnitController extends AbstractController
 
         $images = $this->entityManager
             ->getRepository(Image::class)
-            ->findAll();
+            ->findBy([
+                'organizationalUnit' => $parent,
+            ], ['name' => 'ASC']);
 
         $data = [];