Continue reworking docker setup

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   nats:
-    container_name: cc-nats
+    container_name: nats
     image: nats:alpine
     ports:
       - "4222:4222"
@@ -18,7 +18,7 @@ services:
       - nats
 
   influxdb:
-    container_name: cc-influxdb
+    container_name: influxdb
     image: influxdb
     command: ["--reporting-disabled"]
     environment:
@@ -36,7 +36,7 @@ services:
       - ${DATADIR}/influxdb/config:/etc/influxdb2
 
   openldap:
-    container_name: cc-ldap
+    container_name: ldap
     image: osixia/openldap:1.5.0
     command: --copy-service --loglevel debug
     environment:
@@ -47,7 +47,7 @@ services:
       - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
 
   mariadb:
-    container_name: cc-db
+    container_name: mariadb
     image: mariadb:latest
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
@@ -63,7 +63,7 @@ services:
       - SYS_NICE
 
   # mysql:
-  #   container_name: cc-mysql
+  #   container_name: mysql
   #   image: mysql:8.0.22
   #   command: ["--default-authentication-plugin=mysql_native_password"]
   #   environment:
@@ -79,20 +79,8 @@ services:
   #   cap_add:
   #     - SYS_NICE
 
-  phpmyadmin:
-    container_name: cc-phpmyadmin
-    image: phpmyadmin
-    environment:
-      - PMA_HOST=cc-db
-      - PMA_USER=root
-      - PMA_PASSWORD=${MARIADB_ROOT_PASSWORD}
-    ports:
-      - "127.0.0.1:${PHPMYADMIN_PORT}:80"
-    depends_on:
-      - mariadb
-
   slurm-controller:
-    container_name: slurm-controller
+    container_name: slurmctld
     build:
       context: ./slurm/controller
     privileged: true
@@ -112,7 +100,7 @@ services:
       PARTITION_NAME: docker
 
   slurm-database:
-    container_name: slurm-database
+    container_name: slurmdb
     build:
       context: ./slurm/database
     depends_on:
@@ -131,21 +119,21 @@ services:
       STORAGE_PASS: password
       STORAGE_USER: slurm
 
-  # slurm-worker01:
-  #   container_name: slurm-worker01
-  #   build:
-  #     context: ./slurm/worker
-  #   depends_on:
-  #     - slurm-controller
-  #   privileged: true
-  #   volumes:
-  #     - ./home:/home
-  #     - ./secret:/.secret
-  #   restart: always
-  #   environment:
-  #     CONTROL_MACHINE: controller
-  #     ACCOUNTING_STORAGE_HOST: database
-  #     COMPUTE_NODES: worker01 worker02
+  slurm-worker01:
+    container_name: node01
+    build:
+      context: ./slurm/worker
+    depends_on:
+      - slurm-controller
+    privileged: true
+    volumes:
+      - ./home:/home
+      - ./secret:/.secret
+    restart: always
+    environment:
+      CONTROL_MACHINE: controller
+      ACCOUNTING_STORAGE_HOST: database
+      COMPUTE_NODES: worker01 worker02
 
   # slurm-worker02:
   #   container_name: slurm-worker02