Bump actionpack from 6.1.7.8 to 6.1.7.9

Gemfile.lock

@@ -16,60 +16,60 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailer (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      actionview (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionpack (6.1.7.9)
+      actionview (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (6.1.7.9)
+      activesupport (= 6.1.7.9)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (6.1.7.9)
+      activesupport (= 6.1.7.9)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (6.1.7.9)
+      activesupport (= 6.1.7.9)
+    activerecord (6.1.7.9)
+      activemodel (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
+    activestorage (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (6.1.7.9)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -105,7 +105,7 @@ GEM
     base58 (0.2.3)
     bcrypt (3.1.19)
     bindata (2.4.15)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     childprocess (4.1.0)
     ci_reporter (2.1.0)
@@ -116,7 +116,7 @@ GEM
       rspec (>= 2.14, < 4)
     coderay (1.1.3)
     command_class (0.0.2)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     conjur-api (5.4.2.pre.638)
       activesupport (>= 4.2)
       addressable (~> 2.0)
@@ -221,7 +221,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
-    erubi (1.12.0)
+    erubi (1.13.0)
     event_emitter (0.2.6)
     eventmachine (1.2.7)
     excon (0.100.0)
@@ -304,7 +304,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0305)
     mini_mime (1.1.2)
-    minitest (5.22.2)
+    minitest (5.25.1)
     multi_json (1.15.0)
     multi_test (0.1.2)
     net-imap (0.3.7)
@@ -362,7 +362,7 @@ GEM
     public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.1)
+    racc (1.8.1)
     rack (2.2.8.1)
     rack-oauth2 (2.2.0)
       activesupport
@@ -374,26 +374,26 @@ GEM
     rack-rewrite (1.5.1)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (6.1.7.9)
+      actioncable (= 6.1.7.9)
+      actionmailbox (= 6.1.7.9)
+      actionmailer (= 6.1.7.9)
+      actionpack (= 6.1.7.9)
+      actiontext (= 6.1.7.9)
+      actionview (= 6.1.7.9)
+      activejob (= 6.1.7.9)
+      activemodel (= 6.1.7.9)
+      activerecord (= 6.1.7.9)
+      activestorage (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
+      railties (= 6.1.7.9)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -406,9 +406,9 @@ GEM
     rails_layout (1.0.42)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (6.1.7.9)
+      actionpack (= 6.1.7.9)
+      activesupport (= 6.1.7.9)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -535,7 +535,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xdg (2.2.3)
-    zeitwerk (2.6.13)
+    zeitwerk (2.7.0)
 
 PLATFORMS
   aarch64-linux

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'
 }

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