Update config to be quicker to set up later

Author: rowleya

SpiNNaker-allocserv/Dockerfile

@@ -15,7 +15,7 @@
 # Use Ubuntu
 FROM ubuntu:noble
 
-RUN apt update && apt install -y openjdk-21-jdk-headless maven git ping
+RUN apt update && apt install -y openjdk-21-jdk-headless maven git iputils-ping
 
 # Set the working directory in the container
 WORKDIR /app

SpiNNaker-allocserv/docker-compose.yml

@@ -16,19 +16,23 @@ services:
   spalloc-mysql-db:
     image: mysql:8.0
     container_name: spalloc-mysql-container
-    env_file: spalloc.env
+    environment:
+      SPRING_DATASOURCE_USERNAME: spalloc
+      SPRING_DATASOURCE_PASSWORD: spalloc
+      MYSQL_ROOT_PASSWORD: spalloc-root
     healthcheck:
-        test: ["CMD", "/usr/bin/mysql", "--database=spalloc_history", "--user=$$SPRING_DATASOURCE_USERNAME",  "--password=$$SPRING_DATASOURCE_PASSWORD", "--execute", "SHOW DATABASES;"]
-        interval: 2s
-        timeout: 2s
-        retries: 100
+      test: ["CMD", "/usr/bin/mysql", "--database=spalloc_history", "--user=spalloc",  "--password=spalloc", "--execute", "SHOW DATABASES;"]
+      interval: 2s
+      timeout: 2s
+      retries: 100
     ports:
       - "3306:3306"
     networks:
       - spalloc-mysql
     volumes:
       - spalloc-mysql-data:/var/lib/mysql
       - ./spalloc-mysql/init:/docker-entrypoint-initdb.d
+    restart: always
 
   spalloc:
     build:
@@ -45,10 +49,13 @@ services:
         condition: service_healthy
     env_file: spalloc.env
     environment:
+      SPRING_DATASOURCE_USERNAME: spalloc
+      SPRING_DATASOURCE_PASSWORD: spalloc
       SPRING_DATASOURCE_URL: jdbc:mysql://spalloc-mysql-container:3306/spalloc?autoReconnect=true&useSSL=false
       SPRING_HISTORICAL_DATASOURCE_URL: jdbc:mysql://spalloc-mysql-container:3306/spalloc_history?autoReconnect=true&useSSL=false
     volumes:
       - ./application.yml:/app/application.yml
+    restart: always
 
 networks:
   spalloc-mysql:

SpiNNaker-allocserv/spalloc.env.example

@@ -12,26 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Root password for the MYSQL instance
-MYSQL_ROOT_PASSWORD=
-
-# Username for the spalloc database
-SPRING_DATASOURCE_USERNAME=
-
-# Password for the spalloc database
-SPRING_DATASOURCE_PASSWORD=
-
 # OpenID client id from EBRAINS
-EBRAINS_OPENID_CLIENT_ID=
+EBRAINS_OPENID_CLIENT_ID=spalloc
 
 # OpenID client secret from EBRAINS
 EBRAINS_OPENID_CLIENT_SECRET=
 
 # The host that people will use to access spalloc
+# This is the host name of this machine as seen from outside
 SPRING_SERVER_HOST=
 
 # The API Key to access NMPI services (quota etc.)
 SPALLOC_NMPI_API_KEY=
 
 # The IP address that the proxy should use to speak to real machines
+# This is the IP address of the local machine on the SpiNNaker network (e.g. 10.11.192.X)
 SPALLOC_PROXY_LOCAL_HOST=

mkpasswd.sh

@@ -29,10 +29,5 @@ while true; do
 done
 
 ENCPW=$(htpasswd -bnBC 10 "" $PASSWORD | tr -d ':\n' | sed 's/$2y/$2a/')
-echo $ENCPW
 
-read -p "MySQL database: " MYSQLDB
-read -p "MySQL username: " MYSQLUSER
-read -p "MySQL password: " -s MYSQLPASS
-
-mysql -D $MYSQLDB -u $MYSQLUSER -p$MYSQLPASS -e "INSERT INTO user_info(user_name, encrypted_password, trust_level) VALUES ('$USERNAME', '$ENCPW', $USERTRUST);"
+docker exec -it spalloc-mysql-container /usr/bin/mysql -D spalloc -u spalloc -pspalloc -e "INSERT INTO user_info(user_name, encrypted_password, trust_level) VALUES ('$USERNAME', '$ENCPW', $USERTRUST);"