Bump rexml from 3.2.5 to 3.3.9 in /docs

Jenkinsfile

@@ -130,15 +130,11 @@ if (params.MODE == "PROMOTE") {
       summon -f ./secrets.yml ./publish-images.sh --promote --base-version=${sourceVersion} --version=${targetVersion} --arch=arm64
 
       # Promote manifest that links above images
-      summon -f ./secrets.yml ./publish-manifest.sh --promote --base-version=${sourceVersion} --version=${targetVersion}
+      summon -f ./secrets.yml ./publish-manifest.sh --promote --dockerhub --base-version=${sourceVersion} --version=${targetVersion}
     """
 
-    // TODO: In talking to Neil King, this likely won't work until conjurops is migrated over
-    // to github enterprise. In the absence of promoting an OSS conjur release, though, we haven't
-    // tried it since the Conjur repo migrated over.
-    // Trigger Conjurops build to push newly promoted releases of conjur to ConjurOps Staging
     build(
-      job:'../conjurinc--conjurops/master',
+      job: 'Conjur-Enterprise/Conjur-Enterprise-conjurops/main/Conjur-Enterprise-conjurops-main-full/master',
       parameters:[
         string(name: 'conjur_oss_source_image', value: "cyberark/conjur:${targetVersion}")
       ],

ci/test_suites/authenticators_gcp/deploy_function.sh

@@ -68,7 +68,7 @@ deploy_function() {
   cd "$GCF_SOURCE_DIR"
 
   echo "-- Deploying function: $GCF_FUNC_NAME"
-  gcloud functions deploy "$GCF_FUNC_NAME" --runtime python37 --trigger-http --quiet
+  gcloud functions deploy "$GCF_FUNC_NAME" --no-gen2 --runtime python37 --trigger-http --quiet
 
   echo '-> deploy_function done'
 }

docs/Gemfile.lock

@@ -229,7 +229,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.3.9)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)

publish-images.sh

@@ -132,15 +132,15 @@ if [[ "${PROMOTE}" = true ]]; then
   readarray -t prefix_versions < <(gen_versions "${VERSION}")
 
   for version in latest "${prefix_versions[@]}"; do
-    echo "Pushing images for tag: $version"
-      
+    echo "Pushing images for tag: $version-${ARCH}"
+
     tag_and_push "${version}-${ARCH}" "registry.tld/${IMAGE_NAME}:${LOCAL_TAG}-${ARCH}" "registry.tld/${IMAGE_NAME}"
     tag_and_push "${version}-${ARCH}" "registry.tld/conjur-ubi:${LOCAL_TAG}-${ARCH}" "registry.tld/conjur-ubi"
 
     if [[ "${DOCKERHUB}" ]]; then
       echo "Pushing to DockerHub"
 
-      tag_and_push "${version}" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
+      tag_and_push "${version}-${ARCH}" "${LOCAL_IMAGE}-${ARCH}" "${IMAGE_NAME}"
     fi
   done
 fi
@@ -150,13 +150,13 @@ if [[ "${REDHAT}" = true ]]; then
   # Publish only the tag version to the Redhat container registry
   if docker login "${REDHAT_REGISTRY}" -u "${REDHAT_USER}" -p "${REDHAT_API_KEY}"; then
     # push image to red hat
-    tag_and_push "${VERSION}" "${RH_LOCAL_IMAGE}" "${REDHAT_REMOTE_IMAGE}"
+    tag_and_push "${VERSION}" "${RH_LOCAL_IMAGE}-${ARCH}" "${REDHAT_REMOTE_IMAGE}"
 
     # scan image with preflight tool
     scan_redhat_image "${REDHAT_REMOTE_IMAGE}:${VERSION}" "${REDHAT_CERT_PID}"
 
     # push latest tag to RH
-    tag_and_push "latest" "${RH_LOCAL_IMAGE}" "${REDHAT_REMOTE_IMAGE}"
+    tag_and_push "latest" "${RH_LOCAL_IMAGE}-${ARCH}" "${REDHAT_REMOTE_IMAGE}"
   else
     echo 'Failed to log in to quay.io'
     exit 1

publish-manifest.sh

@@ -22,6 +22,7 @@ function print_help() {
 PUBLISH_EDGE=false
 PUBLISH_INTERNAL=false
 PROMOTE=false
+DOCKERHUB=false
 VERSION=$(<VERSION)
 
 LOCAL_TAG="$(version_tag)"
@@ -40,6 +41,10 @@ for arg in "$@"; do
       PROMOTE=true
       shift
       ;;
+    --dockerhub )
+      DOCKERHUB=true
+      shift
+      ;;
     --version=* )
       VERSION="${arg#*=}"
       shift
@@ -86,6 +91,14 @@ if [[ "${PUBLISH_EDGE}" = true ]]; then
   # Push manifest to internal registry
   prepare_manifest "registry.tld/${IMAGE_NAME}" "edge"
   prepare_manifest "registry.tld/conjur-ubi" "edge"
+
+  # Publish manifests to dockerhub
+  if [[ "${DOCKERHUB}" = true ]]; then
+    echo "Pushing to DockerHub"
+
+    prepare_manifest "${IMAGE_NAME}" "${VERSION}"
+    prepare_manifest "${IMAGE_NAME}" "edge"
+  fi
 fi
 
 if [[ "${PROMOTE}" = true ]]; then
@@ -99,5 +112,12 @@ if [[ "${PROMOTE}" = true ]]; then
 
     prepare_manifest "registry.tld/${IMAGE_NAME}" "${version}"
     prepare_manifest "registry.tld/conjur-ubi" "${version}"
+
+    # Publish manifests to dockerhub
+    if [[ "${DOCKERHUB}" = true ]]; then
+      echo "Pushing to DockerHub"
+
+      prepare_manifest "${IMAGE_NAME}" "${version}"
+    fi
   done
 fi