Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
-ARG ARTIFACTORY_BASE_VERSION=7.21.7
+ARG ARTIFACTORY_BASE_VERSION=7.24.3
 
 FROM releases-docker.jfrog.io/jfrog/artifactory-pro:${ARTIFACTORY_BASE_VERSION} AS base
 

hardening_manifest.yaml

@@ -5,13 +5,13 @@ name: "jfrog/artifactory/artifactory"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "7.21.7"
-- "latest"
+  - "7.24.3"
+  - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
   BASE_TAG: "8.4"
-  ARTIFACTORY_BASE_VERSION: "7.21.7"
+  ARTIFACTORY_BASE_VERSION: "7.24.3"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "artifactory"
@@ -23,7 +23,7 @@ labels:
   org.opencontainers.image.url: "https://jfrog.com"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "JFrog"
-  org.opencontainers.image.version: "7.21.7"
+  org.opencontainers.image.version: "7.24.3"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "storage,devops,container,binary,docker,npm,rpm,debian,python,registry,oci,kubernetes"
   ## This value can be "opensource" or "commercial"
@@ -32,8 +32,8 @@ labels:
   mil.dso.ironbank.product.name: "JFrog Artifactory Pro"
 # List of resources to make available to the offline build context
 resources:
-  - tag: releases-docker.jfrog.io/jfrog/artifactory-pro:7.21.7
-    url: docker://releases-docker.jfrog.io/jfrog/artifactory-pro@sha256:530478c31d73634102400787afd9d60178da177953a72d0e14d98080bb0622e6
+  - tag: releases-docker.jfrog.io/jfrog/artifactory-pro:7.24.3
+    url: docker://releases-docker.jfrog.io/jfrog/artifactory-pro@sha256:493a972fd48819f6c54b02618a174ba058fa53df5dd11d6c9c10aa2d7091dca6
 # List of project maintainers
 maintainers:
   - email: "danielmi@jfrog.com"

helm/iron_bank_values.yaml

@@ -5,7 +5,7 @@ artifactory:
     # Image is pending certification with Iron Bank
     registry: registry1.dso.mil
     repository: ironbank/jfrog/artifactory/artifactory
-    tag: 7.21.7
+    tag: 7.24.3
 global:
   imagePullSecrets:
     - regcred

scripts/artifactory.sh

@@ -10,6 +10,7 @@ ACCESS_NAME=access
 ROUTER_NAME=router
 ROUTER_SERVICE_NAME=router_service
 FRONTEND_NAME=frontend
+JFCONNECT_NAME=jfconnect
 EVENT_NAME=event
 
 # Map contains environment variable key from old version (<7.x) to key from 7.x version
@@ -364,7 +365,6 @@ start() {
             performActionOnScript "${serviceScript}" "start"
         done
         startReplicator
-
         #default to catalina.sh run
         setCatalinaOpts
         if $(isConsoleLogDisabled >/dev/null 2>&1); then
@@ -461,6 +461,8 @@ metadataScript=${ARTIFACTORY_BIN_FOLDER}/../metadata/bin/metadata.sh
 routerScript=${ARTIFACTORY_BIN_FOLDER}/../router/bin/router.sh
 frontendScript=${ARTIFACTORY_BIN_FOLDER}/../frontend/bin/frontend.sh
 eventScript=${ARTIFACTORY_BIN_FOLDER}/../event/bin/event.sh
+jfconnectScript=${ARTIFACTORY_BIN_FOLDER}/../jfconnect/bin/jfconnect.sh
+
 
 # Any new mandatory service to be started or stopped can be added to this variable
 MANDATORY_JF_SERVICES_SCRIPT="${routerScript} ${metadataScript} ${eventScript} ${frontendScript}"
@@ -477,6 +479,10 @@ ACCESS_ETC=$PRODUCT_ETC/$ACCESS_NAME
 REPLICATOR_ETC=$PRODUCT_ETC/$REPLICATOR_NAME
 
 init
+if runJFConnect; then
+  MANDATORY_JF_SERVICES_SCRIPT="${MANDATORY_JF_SERVICES_SCRIPT} ${jfconnectScript} "
+fi
+
 
 if [ "x$1" = "xcheck" ]; then
     checkJavaVersion

scripts/artifactoryCommon.sh

@@ -302,11 +302,12 @@ setRouterToplogy(){
     if runReplicator; then
         JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES="${JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES},jfxfer"
     fi
-
+    if runJFConnect; then
+        JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES="${JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES},jfcon"
+    fi
     if runEvent; then
         JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES="${JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES},jfevt"
     fi
-    
     export JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
 }
 
@@ -529,6 +530,18 @@ runFrontend() {
     fi
 }
 
+runJFConnect() {
+    local isEnabled=
+    getSystemValue "jfconnect.enabled" "false"
+    isEnabled="${YAML_VALUE}"
+
+    if [[ "${isEnabled}" == "true" && -f "${jfconnectScript}" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
 setUserGroup(){
     local defaultUser=${1:-artifactory}
     local defaultGroup=${2:-${defaultUser}}
@@ -713,6 +726,11 @@ performActionOnScript(){
         return 0
     fi
 
+    # If run JFConnect is not enabled, do not perform any action
+    if [[ "${script}" == *${JFCONNECT_NAME}* ]] && ! runJFConnect ; then
+        return 0
+    fi
+
     if [[ -f "${script}" ]] ; then
         chmod +x "${script}"
         . "${script}" "${action}"
@@ -913,4 +931,4 @@ rpmDebStartupActions() {
     setRouterToplogy
     displayEnv
     testOwnership "${JF_PRODUCT_HOME}/var" "${JF_ARTIFACTORY_USER}" "${JF_ARTIFACTORY_GROUP}"
-}
+}
\ No newline at end of file

scripts/artifactoryManage.sh

@@ -26,6 +26,7 @@ ACCESS_NAME=access
 ROUTER_NAME=router
 FRONTEND_NAME=frontend
 EVENT_NAME=event
+JFCONNECT_NAME=jfconnect
 
 # Map contains environment variable key from old version (<7.x) to key from 7.x version
 # This info will be used to assign value from old key to new key
@@ -263,6 +264,7 @@ metadataScript=${ARTIFACTORY_BIN_FOLDER}/../metadata/bin/metadata.sh
 routerScript=${ARTIFACTORY_BIN_FOLDER}/../router/bin/router.sh
 frontendScript=${ARTIFACTORY_BIN_FOLDER}/../frontend/bin/frontend.sh
 eventScript=${ARTIFACTORY_BIN_FOLDER}/../event/bin/event.sh
+jfconnectScript=${ARTIFACTORY_BIN_FOLDER}/../jfconnect/bin/jfconnect.sh
 
 # Any new mandatory service to be started or stopped can be added to this variable
 MANDATORY_JF_SERVICES_SCRIPT="${routerScript} ${metadataScript} ${eventScript} ${frontendScript}"
@@ -280,6 +282,11 @@ CATALINA_LOCK_FILE=${CATALINA_PID_FOLDER}/lock
 CATALINA_MGNT_PORT=${CATALINA_MGNT_PORT:-8015}
 
 init
+
+if runJFConnect; then
+  MANDATORY_JF_SERVICES_SCRIPT="${MANDATORY_JF_SERVICES_SCRIPT} ${jfconnectScript}"
+fi
+
 checkArtUser
 checkArtHome
 checkArData
@@ -288,7 +295,7 @@ checkTomcatHome
 RETVAL=0
 
 case "$1" in
-  start)
+  start)    
         checkJavaVersion
         start
         ;;

scripts/installService.sh

@@ -57,7 +57,7 @@ createArtUser() {
         echo -n "already exists..."
     else
         echo -n "creating..."
-        useradd -M -s /usr/sbin/nologin ${JF_ARTIFACTORY_USER}
+        useradd -g "${JF_ARTIFACTORY_GROUP}" -M -s /usr/sbin/nologin ${JF_ARTIFACTORY_USER}
         if [ ! $? ]; then
             errorArtHome "Could not create user ${JF_ARTIFACTORY_USER}"
         fi
@@ -293,10 +293,10 @@ echo
 echo "Installing artifactory as a Unix service that will run as user ${JF_ARTIFACTORY_USER}${JF_ARTIFACTORY_GROUP:+ and group $JF_ARTIFACTORY_GROUP}"
 echo "Installing artifactory with home ${JF_PRODUCT_HOME}/app"
 
-createArtUser
-
 createArtGroup
 
+createArtUser
+
 createArtDefault
 
 createArtRun

scripts/installerCommon.sh

@@ -51,8 +51,10 @@ SYS_KEY_SHARED_ELASTICSEARCH_USERNAME="shared.elasticsearch.username"
 SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD="shared.elasticsearch.password"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP="shared.elasticsearch.clusterSetup"
 SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE="shared.elasticsearch.unicastFile"
+SYS_KEY_SHARED_ELASTICSEARCH_EXTRAJAVAOPTS="shared.elasticsearch.extraJavaOpts"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP_VALUE="YES"
 SYS_KEY_SHARED_ELASTICSEARCH_EXTERNALISE="shared.elasticsearch.external"
+SYS_KEY_ELASTICSEARCH_APP_VERSION="elasticsearch.app.version"
 
 getDatabaseDriver(){
     local databaseType="$1"
@@ -434,7 +436,7 @@ setInstallerStateKeys() {
 }
 
 # To bump up Elasticsearch version in JFMC (native installers) change version 
-RPM_DEB_ES_VERSION="7.10.2"
+RPM_DEB_ES_VERSION="7.13.2"
 
 # To bump up postgresql version in all products (native installer) change version 
 POSTGRES_VERSION="13.2"

scripts/migrate.sh

@@ -51,8 +51,10 @@ SYS_KEY_SHARED_ELASTICSEARCH_USERNAME="shared.elasticsearch.username"
 SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD="shared.elasticsearch.password"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP="shared.elasticsearch.clusterSetup"
 SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE="shared.elasticsearch.unicastFile"
+SYS_KEY_SHARED_ELASTICSEARCH_EXTRAJAVAOPTS="shared.elasticsearch.extraJavaOpts"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP_VALUE="YES"
 SYS_KEY_SHARED_ELASTICSEARCH_EXTERNALISE="shared.elasticsearch.external"
+SYS_KEY_ELASTICSEARCH_APP_VERSION="elasticsearch.app.version"
 
 getDatabaseDriver(){
     local databaseType="$1"
@@ -434,7 +436,7 @@ setInstallerStateKeys() {
 }
 
 # To bump up Elasticsearch version in JFMC (native installers) change version 
-RPM_DEB_ES_VERSION="7.10.2"
+RPM_DEB_ES_VERSION="7.13.2"
 
 # To bump up postgresql version in all products (native installer) change version 
 POSTGRES_VERSION="13.2"

scripts/systemYamlHelper.sh

@@ -51,8 +51,10 @@ SYS_KEY_SHARED_ELASTICSEARCH_USERNAME="shared.elasticsearch.username"
 SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD="shared.elasticsearch.password"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP="shared.elasticsearch.clusterSetup"
 SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE="shared.elasticsearch.unicastFile"
+SYS_KEY_SHARED_ELASTICSEARCH_EXTRAJAVAOPTS="shared.elasticsearch.extraJavaOpts"
 SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP_VALUE="YES"
 SYS_KEY_SHARED_ELASTICSEARCH_EXTERNALISE="shared.elasticsearch.external"
+SYS_KEY_ELASTICSEARCH_APP_VERSION="elasticsearch.app.version"
 
 getDatabaseDriver(){
     local databaseType="$1"
@@ -434,7 +436,7 @@ setInstallerStateKeys() {
 }
 
 # To bump up Elasticsearch version in JFMC (native installers) change version 
-RPM_DEB_ES_VERSION="7.10.2"
+RPM_DEB_ES_VERSION="7.13.2"
 
 # To bump up postgresql version in all products (native installer) change version 
 POSTGRES_VERSION="13.2"