Align from last SingleStore's deployment-docker updates

.circleci/config.yml

@@ -7,61 +7,33 @@ commands:
             - run: |
                   sudo apt update
                   sudo apt install -y make bash git jq docker
+                  sudo python3 -m pip install --upgrade pip
+                  sudo pip3 install boto3
 
 jobs:
     test:
         machine:
             # https://circleci.com/docs/2.0/images/linux-vm/16.04-to-20.04-migration/
-            image: ubuntu-2004:202201-02
+            image: ubuntu-2004:2024.05.1
         steps:
             - setup_environment
             - checkout
             - run: make test
             - run: make test-destroy
 
-    redhat:
-        parameters:
-            package:
-                type: string
-        machine: true
-        steps:
-            - setup_environment
-            - checkout
-            - run: docker login -u unused --password ${REDHAT_REGISTRY_KEY_NODE} scan.connect.redhat.com
-            - run: make build-<<parameters.package>> redhat-verify-<<parameters.package>> VARIANT=redhat
-
-    redhat-ciab:
-        machine: true
-        steps:
-            - setup_environment
-            - checkout
-            - run: docker login -u unused --password ${REDHAT_REGISTRY_KEY_CIAB} scan.connect.redhat.com
-            - run: make build-ciab redhat-verify-ciab VARIANT=redhat
-
     dockerhub:
         parameters:
             package:
                 type: string
         machine:
             # https://circleci.com/docs/2.0/images/linux-vm/16.04-to-20.04-migration/
-            image: ubuntu-2004:202201-02
+            image: ubuntu-2004:2024.05.1
         steps:
             - setup_environment
             - checkout
             - run: docker login -u ${DOCKER_HUB_USER} --password ${DOCKER_HUB_KEY}
             - run: make build-<<parameters.package>> publish-<<parameters.package>>
 
-    ubi-gcr-internal:
-        machine: true
-        steps:
-            - setup_environment
-            - checkout
-            # We can't use Bash variables in CircleCI so we just duplicate the ""./dockerconfig.json"
-            # string here.
-            - run: echo "${GCLOUD_SERVICE_ACCOUNT_INTERNAL}" | base64 -d >./dockerconfig.json
-            - run: cat ./dockerconfig.json | docker login -u _json_key --password-stdin https://gcr.io
-            - run: make build-node redhat-verify-ubi-gcr-internal-node VARIANT=redhat
-
 workflows:
     test_publish:
         jobs:
@@ -75,94 +47,19 @@ workflows:
                           # Must match line 71.
                           package:
                               [
-                                  "node",
-                                  "node-preview",
-                                  "node-6-8",
-                                  "node-7-0",
-                                  "node-7-1",
-                                  "node-7-3",
-                                  "node-7-5",
-                                  "node-7-6",
-                                  "dynamic-node",
-                                  "ciab",
                                   "tools",
                               ]
                   requires:
                       - test
 
-            - publish-redhat:
-                  name: publish-redhat-<< matrix.package >>
-                  type: approval
-                  matrix:
-                      parameters:
-                          # Must match line 93.
-                          package:
-                              [
-                                  "node",
-                                  "node-7-0",
-                                  "node-7-1",
-                                  "node-7-3",
-                                  "node-7-5",
-                                  "node-7-6"
-                              ]
-                  requires:
-                      - test
-
-            - publish-redhat-ciab:
-                  name: publish-redhat-ciab
-                  type: approval
-                  requires:
-                      - test
 
             - dockerhub:
                   name: dockerhub-<< matrix.package >>
                   matrix:
                       parameters:
                           package:
                               [
-                                  "node",
-                                  "node-preview",
-                                  "node-6-8",
-                                  "node-7-0",
-                                  "node-7-1",
-                                  "node-7-3",
-                                  "node-7-5",
-                                  "node-7-6",
-                                  "dynamic-node",
-                                  "ciab",
                                   "tools",
                               ]
                   requires:
                       - publish-dockerhub-<< matrix.package >>
-
-            - redhat:
-                  name: redhat-<< matrix.package >>
-                  matrix:
-                      parameters:
-                          package:
-                              [
-                                  "node",
-                                  "node-7-0",
-                                  "node-7-1",
-                                  "node-7-3",
-                                  "node-7-5",
-                                  "node-7-6"
-                              ]
-                  requires:
-                      - publish-redhat-<< matrix.package >>
-
-            - redhat-ciab:
-                  name: redhat-ciab
-                  requires:
-                      - publish-redhat-ciab
-
-            - publish-ubi-gcr-internal:
-                  name: publish-ubi-gcr-internal
-                  type: approval
-                  requires:
-                      - test
-
-            - ubi-gcr-internal:
-                  name: ubi-gcr-internal
-                  requires:
-                      - publish-ubi-gcr-internal

Dockerfile-base

@@ -10,16 +10,18 @@ COPY setup/user-change.sh /
 RUN /user-change.sh
 RUN rm /user-change.sh
 
+# updates and basic utilities
+ARG RELEASE_CHANNEL
+RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+
 # Tell yum to yell on missing packages.
 # https://serverfault.com/a/923357
 RUN yum install yum-utils -y
 RUN yum-config-manager --save --setopt=skip_missing_names_on_install=0
 
-# updates and basic utilities
-ARG RELEASE_CHANNEL=production
 # currently yum update-minimal fails on curl, so we need to update curl before
 RUN yum update curl -y && yum -y update-minimal --setopt=tsflags=nodocs \
-      --security --sec-severity=Important --sec-severity=Critical \
+      --security --sec-severity=Important --sec-severity=Critical --nobest \
  && yum install -y yum-utils wget procps
 
 RUN yum-config-manager --add-repo https://release.memsql.com/${RELEASE_CHANNEL}/rpm/x86_64/repodata/memsql.repo \
@@ -28,17 +30,8 @@ RUN yum-config-manager --add-repo https://release.memsql.com/${RELEASE_CHANNEL}/
 RUN dnf --enablerepo=* clean all && dnf update -y; exit 0
 
 # address vulnarabilities found by `grype --only-fixed` command
-RUN yum remove vim-minimal platform-python-pip.noarch -y && yum update expat libxml2 libgcrypt -y
-
-# jq 1.6
-ENV JQ_VERSION='1.6'
-RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key -O /tmp/jq-release.key && \
-    wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \
-    wget --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \
-    gpg --import /tmp/jq-release.key && \
-    gpg --verify /tmp/jq-linux64.asc /tmp/jq-linux64 && \
-    cp /tmp/jq-linux64 /usr/bin/jq && \
-    chmod +x /usr/bin/jq && \
-    rm -f /tmp/jq-release.key && \
-    rm -f /tmp/jq-linux64.asc && \
-    rm -f /tmp/jq-linux64
+RUN yum update expat libxml2 gnupg2 libgcrypt openssl-libs pcre2 curl libcurl-minimal systemd platform-python python3-libs gnutls libksba sqlite-libs zlib libcom_err krb5-libs dbus libtasn1 libarchive unbound-libs tar platform-python-setuptools python3-setuptools-wheel sqlite-libs systemd systemd-libs systemd-pam oniguruma gnutls python3-rpm python3-unbound rpm rpm-build-libs rpm-libs rpm-plugin-systemd-inhibit unbound-libs -y
+RUN yum remove vim-minimal platform-python-pip.noarch -y
+
+RUN yum install -y jq-1.6
+RUN yum install -y which

Dockerfile-ciab

@@ -4,12 +4,14 @@ FROM ${BASE_IMAGE}
 
 # install SingleStore DB packages and additional dependencies
 ARG CLIENT_VERSION
+ARG SERVER_PACKAGE
 ARG SERVER_VERSION
 ARG STUDIO_VERSION
 ARG TOOLBOX_VERSION
+ARG JRE_PACKAGES
 RUN yum install -y \
     singlestore-client-${CLIENT_VERSION} \
-    singlestoredb-server${SERVER_VERSION} \
+    ${SERVER_PACKAGE}${SERVER_VERSION} \
     singlestoredb-studio-${STUDIO_VERSION} \
     singlestoredb-toolbox-${TOOLBOX_VERSION} \
  && yum clean all
@@ -18,6 +20,11 @@ RUN mkdir -p /home/memsql && chown memsql:memsql /home/memsql
 ADD ciab-assets/studio.hcl /var/lib/singlestoredb-studio/studio.hcl
 RUN chown memsql:memsql /var/lib/singlestoredb-studio/studio.hcl
 
+RUN for pkg in ${JRE_PACKAGES} ; do \
+      yum install -y ${pkg}; \
+    done \
+    && yum clean all
+
 VOLUME ["/var/lib/memsql"]
 
 LABEL name="SingleStore DB Cluster in a Box"

Dockerfile-tools

@@ -21,5 +21,4 @@ RUN yum update -y \
 RUN yum install python3.9 -y && pip3 install boto3 azure-storage-blob awscli pymysql
 
 ADD assets/report /report
-ADD assets/backup /backup