remove non-default dockerfile and injection of base image as part of the build process, adjust CI/CD process, clean up

.gitlab-ci.yml

@@ -2,35 +2,24 @@ docker-latest-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: ""
     EXCLUDE_DB: "false"
-    DOCKER_FILE: "Dockerfile"
+    BASE_IMAGE: "node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
@@ -43,285 +32,208 @@ docker-latest-no-db-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: ""
     EXCLUDE_DB: "true"
-    DOCKER_FILE: "Dockerfile"
+    BASE_IMAGE: "node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-arm32v7-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "arm32v7"
     EXCLUDE_DB: "false"
-    DOCKER_FILE: "Dockerfile.arm32v7"
+    BASE_IMAGE: "arm32v7/node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-arm32v7-no-db-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "arm32v7"
     EXCLUDE_DB: "true"
-    DOCKER_FILE: "Dockerfile.arm32v7"
+    BASE_IMAGE: "arm32v7/node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-arm64v8-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "arm64v8"
     EXCLUDE_DB: "false"
-    DOCKER_FILE: "Dockerfile.arm64v8"
+    BASE_IMAGE: "arm64v8/node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-arm64v8-no-db-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "arm64v8"
     EXCLUDE_DB: "true"
-    DOCKER_FILE: "Dockerfile.arm64v8"
+    BASE_IMAGE: "arm64v8/node:18-bullseye-slim"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-nvidia-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "nvidia"
     EXCLUDE_DB: "false"
-    DOCKER_FILE: "Dockerfile.nvidia"
+    BASE_IMAGE: "nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu22.04"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile
 
 docker-nvidia-no-db-build:
   image: docker:latest
   stage: build
   variables:
-    ARCH_TYPE: "nvidia"
     EXCLUDE_DB: "true"
-    DOCKER_FILE: "Dockerfile.nvidia"
+    BASE_IMAGE: "nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu22.04"
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      export BRANCH_PREFIX="latest" ; 
+      BRANCH_PREFIX="$(if [ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]; then echo ${CI_COMMIT_REF_SLUG} ; else echo 'latest'; fi)"
-      export NO_DB_SUFIX="" ;
+      NO_DB_SUFIX="$(${EXCLUDE_DB} && echo '-no-db' || echo '')"
-      export BRANCH_SEP="" ;
+      BASE_IMAGE_ARCH="$(echo ${BASE_IMAGE} | cut -d'/' -f1)"
+      BASE_IMAGE_TYPE="$(echo ${BASE_IMAGE} | cut -d'/' -f2)"
+      ARCH_TYPE="$(if [ $BASE_IMAGE_ARCH != $BASE_IMAGE_TYPE ]; then echo '-'${BASE_IMAGE_ARCH}; else echo ''; fi )"
 
-      if [[ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]]; then
+      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${ARCH_TYPE}${NO_DB_SUFIX}"
-        export BRANCH_PREFIX="${CI_COMMIT_REF_SLUG}" ;
-      fi 
-
-      if [[ "${EXCLUDE_DB}" == "true" ]]; then
-        export NO_DB_SUFIX="-no-db" ;
-      fi
-
-      if [[ "${ARCH_TYPE}" != "" ]]; then
-        export BRANCH_SEP="-" ;
-      fi
-
-      export IMAGE_NAME="$CI_REGISTRY_IMAGE:${BRANCH_PREFIX}${BRANCH_SEP}${ARCH_TYPE}${NO_DB_SUFIX}" ;
       echo "Running on branch '${CI_COMMIT_BRANCH}', Image: ${IMAGE_NAME}" ;
 
-    - docker build --pull --build-arg VAR_EXCLUDE_DB="${EXCLUDE_DB}" -t "${IMAGE_NAME}" . -f "${DOCKER_FILE}"
+    - docker build --pull --build-arg EXCLUDE_DB="${EXCLUDE_DB}" --build-arg BASE_IMAGE="${BASE_IMAGE}" -t "${IMAGE_NAME}" . -f "Dockerfile"
     - docker push "${IMAGE_NAME}"
   rules:
     - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "dev"
       when: never
     - if: $CI_COMMIT_BRANCH
       exists:
-        - $DOCKER_FILE
+        - Dockerfile

Docker/install_dependencies.sh

@@ -1,86 +0,0 @@
-#!/bin/sh
-mkdir -p /etc/apt/keyrings
-
-apt update -y --fix-missing
-apt upgrade -y
-apt update -y --fix-missing
-
-apt install -y \
-        wget \
-        curl \
-        net-tools \
-        software-properties-common \
-        libfreetype6-dev \
-        libgnutls28-dev \
-        libmp3lame-dev \
-        libass-dev \
-        libogg-dev \
-        libtheora-dev \
-        libvorbis-dev \
-        libvpx-dev \
-        libwebp-dev \
-        libssh2-1-dev \
-        libopus-dev \
-        librtmp-dev \
-        libx264-dev \
-        libx265-dev \
-        yasm \
-        build-essential \
-        bzip2 \
-        coreutils \
-        procps \
-        gnutls-bin \
-        nasm \
-        tar \
-        x264 \
-        ffmpeg \
-        git \
-        make \
-        g++ \
-        gcc \
-        pkg-config \
-        python3 \
-        tar \
-        sudo \
-        xz-utils \
-        ca-certificates \
-        gnupg \
-        apt-utils
-
-if [ "$INSTALL_NODE" = "true" ] ; then set -ex; \
-	curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg ; \
-	echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list ; \
-	apt update -y --fix-missing ; \
-	apt upgrade -y ; \
-	apt install nodejs -y ; fi 
-
-node -v
-npm -v
-
-npm i npm@latest pm2 pg -g  --save
-npm install --unsafe-perm 
-
-chmod 777 /home/Shinobi
-chmod -R 777 /home/Shinobi/plugins
-chmod -f +x /home/Shinobi/Docker/init.sh
-
-sed -i -e 's/\r//g' /home/Shinobi/Docker/init.sh
-
-ffmpeg -version
-
-# Install MariaDB server... the debian way
-if [ "$DB_DISABLE_INCLUDED" = "false" ] ; then set -ex; \
-	{ \
-		echo "mariadb-server" mysql-server/root_password password '${DB_ROOT_PASSWORD}'; \
-		echo "mariadb-server" mysql-server/root_password_again password '${DB_ROOT_PASSWORD}'; \
-	} | debconf-set-selections; \
-        mkdir -p /var/lib/mysql; \
-        apt-get update; \
-	apt-get install -y \
-		"mariadb-server" \
-        socat \
-	; \
-        find /etc/mysql/ -name '*.cnf' -print0 \
-		| xargs -0 grep -lZE '^(bind-address|log)' \
-		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; \
-        sed -ie "s/^bind-address\s*=\s*127\.0\.0\.1$/#bind-address = 0.0.0.0/" /etc/mysql/my.cnf; fi

Docker/install_ffmpeg.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+apt-get install -y \
+        libfreetype6-dev \
+        libgnutls28-dev \
+        libmp3lame-dev \
+        libass-dev \
+        libogg-dev \
+        libtheora-dev \
+        libvorbis-dev \
+        libvpx-dev \
+        libwebp-dev \
+        libssh2-1-dev \
+        libopus-dev \
+        librtmp-dev \
+        libx264-dev \
+        libx265-dev \
+        x264 \
+        ffmpeg 
+
+ffmpeg -version

Docker/install_mariadb.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+$EXCLUDE_DB > /dev/null
+
+if [ "$?" -ne 0 ] ; then 
+    echo "Installing MariaDB"
+    set -ex
+	{ \
+		echo "mariadb-server" mysql-server/root_password password '${DB_ROOT_PASSWORD}'; \
+		echo "mariadb-server" mysql-server/root_password_again password '${DB_ROOT_PASSWORD}'; \
+	} | debconf-set-selections
+
+    mkdir -p /var/lib/mysql
+    apt-get update
+	
+    apt-get install -y mariadb-server socat
+    
+    find /etc/mysql/ -name '*.cnf' -print0 | xargs -0 grep -lZE '^(bind-address|log)' | xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'
+    sed -ie "s/^bind-address\s*=\s*127\.0\.0\.1$/#bind-address = 0.0.0.0/" /etc/mysql/my.cnf
+fi

Docker/install_nodejs.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+which node > /dev/null
+
+if [ "$?" -ne 0 ] ; then 
+    echo "Installing NodeJS 18"
+    mkdir -p /etc/apt/keyrings
+    apt-get install -y ca-certificates gnupg
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+    
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+    
+    apt-get update -y --fix-missing 
+    apt-get upgrade -y 
+    apt-get install nodejs -y
+fi 
+
+node -v
+npm -v
+
+npm i npm@latest pm2 pg -g --save
+npm install --unsafe-perm

Dockerfile

@@ -1,7 +1,8 @@
-FROM node:18-bullseye-slim
+ARG BASE_IMAGE=node:18-bullseye-slim
-
+FROM ${BASE_IMAGE}
+    
 ARG DEBIAN_FRONTEND=noninteractive \
-    VAR_EXCLUDE_DB=false
+    EXCLUDE_DB=false
 
 ENV DB_USER=majesticflame \
     DB_PASSWORD='' \
@@ -18,12 +19,50 @@ ENV DB_USER=majesticflame \
     SSL_ORGANIZATION='Shinobi Systems' \
     SSL_ORGANIZATION_UNIT='IT Department' \
     SSL_COMMON_NAME='nvr.ninja' \
-    DB_DISABLE_INCLUDED=$VAR_EXCLUDE_DB
+    DB_DISABLE_INCLUDED=$EXCLUDE_DB
 
 WORKDIR /home/Shinobi
 COPY . ./
 
-RUN sh /home/Shinobi/Docker/install_dependencies.sh
+RUN apt-get update -y
+RUN apt-get upgrade -y
+
+RUN apt-get install -y \
+        wget \
+        curl \
+        net-tools \
+        software-properties-common \
+        build-essential \
+        git \
+        python3 \
+        sudo \
+        pkg-config \
+        apt-utils \
+        yasm \
+        bzip2 \
+        coreutils \
+        procps \
+        gnutls-bin \
+        nasm \
+        tar \
+        make \
+        g++ \
+        gcc \
+        tar \
+        xz-utils
+
+RUN sh /home/Shinobi/Docker/install_ffmpeg.sh
+RUN sh /home/Shinobi/Docker/install_mariadb.sh
+RUN sh /home/Shinobi/Docker/install_nodejs.sh
+
+RUN chmod 777 /home/Shinobi
+RUN chmod -R 777 /home/Shinobi/plugins
+RUN chmod -f +x /home/Shinobi/Docker/init.sh
+
+RUN sed -i -e 's/\r//g' /home/Shinobi/Docker/init.sh
+
+RUN apt-get update -y --fix-missing
+RUN apt-get upgrade -y
 
 VOLUME ["/home/Shinobi/videos"]
 VOLUME ["/home/Shinobi/libs/customAutoLoad"]
@@ -31,6 +70,6 @@ VOLUME ["/config"]
 
 EXPOSE 8080 443 21 25
 
-ENTRYPOINT ["sh", "/home/Shinobi/Docker/init.sh"]
+ENTRYPOINT ["/home/Shinobi/Docker/init.sh"]
 
-CMD [ "pm2-docker", "/home/Shinobi/Docker/pm2.yml" ]
+CMD [ "pm2-docker", "/home/Shinobi/Docker/pm2.yml" ]

Dockerfile.arm32v7

@@ -1,36 +0,0 @@
-FROM arm32v7/node:18-bullseye-slim
-    
-ARG DEBIAN_FRONTEND=noninteractive \
-    VAR_EXCLUDE_DB=false
-
-ENV DB_USER=majesticflame \
-    DB_PASSWORD='' \
-    DB_HOST='localhost' \
-    DB_DATABASE=ccio \
-    DB_PORT=3306 \
-    DB_TYPE='mysql' \
-    SUBSCRIPTION_ID=sub_XXXXXXXXXXXX \
-    PLUGIN_KEYS='{}' \
-    SSL_ENABLED='false' \
-    SSL_COUNTRY='CA' \
-    SSL_STATE='BC' \
-    SSL_LOCATION='Vancouver' \
-    SSL_ORGANIZATION='Shinobi Systems' \
-    SSL_ORGANIZATION_UNIT='IT Department' \
-    SSL_COMMON_NAME='nvr.ninja' \
-    DB_DISABLE_INCLUDED=$VAR_EXCLUDE_DB
-
-WORKDIR /home/Shinobi
-COPY . ./
-
-RUN sh /home/Shinobi/Docker/install_dependencies.sh
-
-VOLUME ["/home/Shinobi/videos"]
-VOLUME ["/home/Shinobi/libs/customAutoLoad"]
-VOLUME ["/config"]
-
-EXPOSE 8080 443 21 25
-
-ENTRYPOINT ["/home/Shinobi/Docker/init.sh"]
-
-CMD [ "pm2-docker", "/home/Shinobi/Docker/pm2.yml" ]

Dockerfile.arm64v8

@@ -1,36 +0,0 @@
-FROM arm64v8/node:18-bullseye-slim
-    
-ARG DEBIAN_FRONTEND=noninteractive \
-    VAR_EXCLUDE_DB=false
-
-ENV DB_USER=majesticflame \
-    DB_PASSWORD='' \
-    DB_HOST='localhost' \
-    DB_DATABASE=ccio \
-    DB_PORT=3306 \
-    DB_TYPE='mysql' \
-    SUBSCRIPTION_ID=sub_XXXXXXXXXXXX \
-    PLUGIN_KEYS='{}' \
-    SSL_ENABLED='false' \
-    SSL_COUNTRY='CA' \
-    SSL_STATE='BC' \
-    SSL_LOCATION='Vancouver' \
-    SSL_ORGANIZATION='Shinobi Systems' \
-    SSL_ORGANIZATION_UNIT='IT Department' \
-    SSL_COMMON_NAME='nvr.ninja' \
-    DB_DISABLE_INCLUDED=$VAR_EXCLUDE_DB
-
-WORKDIR /home/Shinobi
-COPY . ./
-
-RUN sh /home/Shinobi/Docker/install_dependencies.sh
-
-VOLUME ["/home/Shinobi/videos"]
-VOLUME ["/home/Shinobi/libs/customAutoLoad"]
-VOLUME ["/config"]
-
-EXPOSE 8080 443 21 25
-
-ENTRYPOINT ["/home/Shinobi/Docker/init.sh"]
-
-CMD [ "pm2-docker", "/home/Shinobi/Docker/pm2.yml" ]

Dockerfile.nvidia

@@ -1,39 +0,0 @@
-FROM nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu22.04
-
-ARG DEBIAN_FRONTEND=noninteractive \
-    VAR_EXCLUDE_DB=false \
-    VAR_INSTALL_NODE=true
-
-ENV DB_USER=majesticflame \
-    DB_PASSWORD='' \
-    DB_HOST='localhost' \
-    DB_DATABASE=ccio \
-    DB_PORT=3306 \
-    DB_TYPE='mysql' \
-    SUBSCRIPTION_ID=sub_XXXXXXXXXXXX \
-    PLUGIN_KEYS='{}' \
-    SSL_ENABLED='false' \
-    SSL_COUNTRY='CA' \
-    SSL_STATE='BC' \
-    SSL_LOCATION='Vancouver' \
-    SSL_ORGANIZATION='Shinobi Systems' \
-    SSL_ORGANIZATION_UNIT='IT Department' \
-    SSL_COMMON_NAME='nvr.ninja' \
-    DB_DISABLE_INCLUDED=$VAR_EXCLUDE_DB \
-    NODE_MAJOR=18 \
-    INSTALL_NODE=$VAR_INSTALL_NODE
-
-WORKDIR /home/Shinobi
-COPY . ./
-
-RUN sh /home/Shinobi/Docker/install_dependencies.sh
-
-VOLUME ["/home/Shinobi/videos"]
-VOLUME ["/home/Shinobi/libs/customAutoLoad"]
-VOLUME ["/config"]
-
-EXPOSE 8080 443 21 25
-
-ENTRYPOINT ["sh", "/home/Shinobi/Docker/init.sh"]
-
-CMD [ "pm2-docker", "/home/Shinobi/Docker/pm2.yml" ]