Update Containerfiles and compose stack, and switch from MySQL to MariaDB

The Debian-variant of MySQL image no longer seems to be an actively supported platform as the proprietary Oracle Linux-variant is:
docker-library/mysql#867

Author: cjsimon

Taskfile

@@ -176,18 +176,22 @@
         # Helper Functions #
         ####################
 
+            # The global list of containers defined in the compose stack
+            #
+            # TODO: Parse container-compose.yml and read in valid service containers
+            #       instead of hardcoding them here
+            #
+            containers=('app' 'database')
+            
             function validateContainer {
                 local args=("$@")
 
-                local containers=('app' 'database')
                 local targetContainer="${args[0]}"
 
                 # Validate the targetContainer name
                 if [[ " ${containers[*]} " =~ [[:space:]]${targetContainer}[[:space:]] ]]; then
                     return 0
                 else
-                    error "Error! Invalid container: $targetContainer"
-                    error "Valid containers: ${containers[*]}"
                     return 1
                 fi
             }
@@ -264,7 +268,7 @@
 
         function build {
             local args=("$@")
-            local targetContainer="${args[0]}"
+            local targetContainer="${args[0]}" # TODO: Support multiple containers
 
             # Check if a targetContainer is supplied;
             # otherwise, all containers will be built
@@ -273,6 +277,9 @@
                 validateContainer "$targetContainer"
                 # Check if a validation error occurred
                 if [[ "$?" -ne 0 ]]; then
+                    error "Error! Invalid container: $targetContainer"
+                    error "Valid containers: ${containers[*]}"
+                    
                     return "$?"
                 fi
                 # "Shift out" the targetContainer arg from the list of args
@@ -294,11 +301,89 @@
     #########
     # start #
     #########
-    
+        
+        # Either `compose start`s a set of existing containers given their stack service names as args,
+        # or `compose up`s the entire stack. Use -- to seperate between list of containers and command args.
+        #
+        # Note: If `compose up` is determined for use, all args will be passed to that command instaed
+        #
+        # Note: `compose start` only starts existing stopped containers,
+        #       while `compose up` creates them from the stack
+        #
         function start {
-            podman-compose up
-            return "$?"
+            local args=("$@")
+            
+            # Short circut no args to compose-up
+            if [[ -z "${args[@]}" ]]; then
+                podman-compose up "${args[@]}"
+                return "$?"
+            fi
+            
+            # Seperate passed container args from passed command args, whether applicable or not.
+            #
+            # For this function, only the compose-start command requires such a distinction,
+            # but the function determines whether to compose-start or compose-up depending on
+            # the targetContainers supplied anyways.
+            #
+            # While doing all the work upfront maybe wasteful, it's more readable at the moment
+            
+            local separatorHasBeenFound=false
+            
+            local argsList1=() # targetContainer args
+            local argsList2=() # args for the command
+            
+            for currentArg in "${args[@]}"; do
+                [[ "$currentArg" == '--' ]]
+                local argIsSeperator="$?"
+                
+                if [[ "$separatorHasBeenFound" = false && "$argIsSeperator" -eq 0 ]]; then
+                    separatorHasBeenFound=true
+                elif [[ "$separatorHasBeenFound" = false ]]; then
+                    # No seperator yet; arg belongs in the first bucket
+                    argsList1+=("$currentArg")
+                else
+                    # Seperator found; arg belongs in the second bucket
+                    argsList2+=("$currentArg")
+                fi
+            done
+            
+            # In an attempt to compose-start, look for at least one valid container from the targetContainers
+            # otherwise, the container stack will be upped, and both argsLists will be passed to that command
+            
+            # Assume the first set of args are targetContainers
+            local targetContainers="$argsList1"
+            local validTargetContainers=()
+            
+            for targetContainer in "$targetContainers"; do
+                
+                validateContainer "$targetContainer"
+                # If validation was successful, add the container to the set of validTargetContainers for processing;
+                if [[ "$?" -eq 0 ]]; then
+                    validTargetContainers+="$targetContainer"
+                else # otherwise, indicate its invalidity and omit it from the list of validTargetContainers
+                    error "Invalid container: $targetContainer"
+                fi
+            done
+            
+            if (( ${#validTargetContainers[@]} != 0 )); then
+                
+                # Valid targetContainers found;
+                # gather args and compose-start
+                local commandArgs="$argsList2"
+                podman-compose start "${validTargetContainers[@]}" "${commandArgs[@]}"
+                return "$?"
+                
+            else
+                
+                # No valid targetContainers to start supplied;
+                # compose-up instead, using all supplied args
+                argsList1+=("${argsList2[@]}")
+                podman-compose up "${args[@]}"
+                return "$?"
+                
+            fi
         }
+        alias up='start'
         alias default='start'
         alias run='default' # TODO: Make a TASKFILE_RUN_RUNS_DEFAULT=1 flag that automatically runs the
                             #       "default" task if no args are supplied to run. That way, we optionally
@@ -334,8 +419,34 @@
     ########
 
         function down {
-            podman-compose down
-            return "$?"
+            local args=("$@")
+            local targetContainer="${args[0]}" # TODO: Support multiple containers
+            
+            # Check if a targetContainer is supplied;
+            # otherwise, all containers will be downed
+            if [[ -n "$targetContainer" ]] then
+                
+                validateContainer "$targetContainer"
+                # Check if a validation error occurred
+                if [[ "$?" -ne 0 ]]; then
+                    error "Error! Invalid container: $targetContainer"
+                    error "Valid containers: ${containers[*]}"
+                    
+                    return "$?"
+                fi
+                # "Shift out" the targetContainer arg from the list of args
+                args=("${args[@]:1}")
+                
+                podman-compose down "$targetContainer" "${args[@]}"
+                return "$?"
+                
+            else
+                
+                # Down the stack
+                podman-compose down "${args[@]}"
+                return "$?"
+                
+            fi
         }
         alias clean='down'
 
@@ -350,6 +461,9 @@
             validateContainer "$targetContainer"
             # Check if a validation error occurred
             if [[ "$?" -ne 0 ]]; then
+                error "Error! Invalid container: $targetContainer"
+                error "Valid containers: ${containers[*]}"
+                
                 return "$?"
             fi
             # "Shift out" the targetContainer arg from the list of args
@@ -367,7 +481,7 @@
         function restart {
             stop
             down
-            start
+            start #TODO: Use alias 'up' when it works
             return "$?"
         }
 

app/Containerfile

@@ -0,0 +1,67 @@
+ARG image_variant
+
+ARG python_version=3.12
+ARG python_image=docker.io/python:${python_version}
+
+ARG base_image=${python_image}
+
+FROM ${base_image} AS base-image
+    
+    ENV BUILD_ENVIRONMENT=${image_variant}
+
+FROM base-image AS base-shared
+    
+    
+
+FROM base-shared AS os-dependencies-shared
+    
+    # Install micropipenv
+    RUN pip install 'micropipenv>=1.8.0,<1.9.0'
+
+FROM os-dependencies-shared AS production-os-dependencies
+    
+    
+
+FROM os-dependencies-shared AS os-dependencies-development
+    
+    
+
+FROM os-dependencies-${image_variant} AS project-dependencies-shared
+    
+    WORKDIR /usr/src/app/
+    
+    # COPY in the Pipenv requirements independently of the app source
+    COPY ./src/Pipfile.lock ./
+
+FROM project-dependencies-shared AS project-dependencies-production
+    
+    # Install prod app dependencies
+    RUN micropipenv install --method pipenv
+    
+FROM project-dependencies-shared AS project-dependencies-development
+    
+    # Install app dependencies, including dev ones
+    RUN micropipenv install --dev --method pipenv
+    
+    COPY ./src/ ./
+
+FROM project-dependencies-${image_variant} AS post-project-dependencies-shared
+    
+    
+
+FROM post-project-dependencies-shared AS post-project-dependencies-production
+    
+    
+
+FROM post-project-dependencies-shared AS post-project-dependencies-development
+    
+    
+
+FROM post-project-dependencies-${image_variant} AS entrypoint-shared
+    
+    WORKDIR /usr/src/app/
+    ENTRYPOINT python
+    CMD run.py
+
+FROM entrypoint-shared AS final-image
+FROM final-image AS moviemanager-app-${image_variant}

app/container/containerfile

@@ -2,13 +2,16 @@ version: '3'
 services:
   app:
     container_name: app
-    restart: "no"
-    working_dir: /var/www/html/
+    #
+    #image: 
+    # or
     build:
       context: ./app/
-      dockerfile: ./containerfile
-    args:
-      image_variant: development
+      dockerfile: Containerfile
+      args:
+        image_variant: development
+    #
+    restart: "no"
     environment:
       APPLICATION_ENVIRONMENT: DEVELOPMENT
       APPLICATION_HOST: '0.0.0.0'
@@ -23,25 +26,32 @@ services:
 
   database:
     container_name: database
+    #
+    #image: 
+    # or
+    image: mariadb:lts
+    #
     restart: "no"
-    build:
-      context: ./database/
-      dockerfile: ./containerfile
-    args:
-      image_variant: development
     environment:
+      MYSQL_ROOT_PASSWORD: root1234
       MYSQL_USER: movie_app
       MYSQL_PASSWORD: movie_app1234
-      MYSQL_ROOT_PASSWORD: root1234
       MYSQL_DATABASE: movie_manager
     volumes:
       # Database conf files
       - ./conf.d/mysql.cnf:/etc/mysql/conf.d/mysql.cnf:Z
+      
       # Sql files to initialize the server with
+      #
+      # Note: Only scripts in that top-level directory
+      #       are executed, in alphabetical order
+      #
       - ./initdb/:/docker-entrypoint-initdb.d/:Z
-      # Additional sql files
-      - ./sql/:/usr/src/sql/:Z
-      # Persist database data to host
-      - ./dbdata/:/var/lib/mysql/:Z
+      
+      # Volume-out database data to host as a persistent, named volume
+      - dbdata:/var/lib/mysql/:Z
     ports:
       - 3306:3306
+
+volumes:
+  dbdata: