Fix docker maven url (#4158)

* Fix maven url in docker script

* Add workflow allowing the re-generation of docker images

* Add missing dry_run parameter, fix casing

* Move checkout outside of composite action, as it is likely required

Author: JonasKunz

.github/actions/build-and-publish-docker/action.yml

@@ -0,0 +1,32 @@
+name: 'Build and publish docker images'
+description: 'Builds and publishes the docker images for a given version using the agent artifact from maven central'
+inputs:
+  release_version:
+    description: 'The version to release. If this is the currently latest version based on the git tags, it will also be published as latest'
+    required: true
+  ref:
+    description: 'Branch or tag ref to run the action, defines the version of the scripts in the ./scripts folder to run'
+    required: true
+  dry_run:
+    description: If set, generate the docker image but don't publish it
+    required: true
+    type: boolean
+runs:
+  using: "composite"
+  env:
+    SONATYPE_FALLBACK: 1
+  steps:
+    - name: Log in to the Elastic Container registry
+      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+      with:
+        registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
+        username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
+        password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
+
+    - name: "Build docker image"
+      shell: bash
+      run: ./scripts/docker-release/build_docker.sh "${{ inputs.release_version }}"
+    - name: "Push docker image"
+      if: ${{ ! inputs.dry_run }}
+      shell: bash
+      run: ./scripts/docker-release/push_docker.sh "${{ inputs.release_version }}"

.github/workflows/regenerate-docker-images.yml

@@ -0,0 +1,41 @@
+---
+# Regenerate the docker images based on what is released at maven central if something went wrong during the standard release process
+name: 'regenerate-docker-images'
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Branch or tag ref to run the workflow on'
+        required: true
+        default: "main"
+      version:
+        description: |
+          The version of the agent to re-generate and publish the docker images for (e.g. 1.2.3).
+          If this is the latest tag (based on the selected ref), the image will also be published with the latest-tag.
+        required: true
+      dry_run:
+        description: If set, generates the images but doesn't push them
+        default: false
+        type: boolean
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}
+
+jobs:
+  build-and-push-docker-images:
+    name: "Build and push docker images"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0 # Load entire history as it is required for the push-script
+      - uses: ./.github/actions/build-and-publish-docker
+        with:
+          release_version: ${{ inputs.version }}
+          ref: ${{ inputs.ref }}
+          dry_run: ${{ inputs.dry_run }}

.github/workflows/release-step-3.yml

@@ -129,28 +129,16 @@ jobs:
     needs:
       - await-maven-central-artifact
       - create-github-release
-    env:
-      SONATYPE_FALLBACK: 1
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0 # Load entire history as it is required for the push-script
-
-      - name: Log in to the Elastic Container registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+      - uses: ./.github/actions/build-and-publish-docker
         with:
-          registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
-          username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
-          password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
-
-      - name: "Build docker image"
-        shell: bash
-        run: ./scripts/docker-release/build_docker.sh "${{ env.RELEASE_VERSION }}"
-      - name: "Push docker image"
-        if: ${{ ! inputs.dry_run }}
-        shell: bash
-        run: ./scripts/docker-release/push_docker.sh "${{ env.RELEASE_VERSION }}"
+          release_version: "${{ env.RELEASE_VERSION }}"
+          ref: ${{ inputs.ref }}
+          dry_run: ${{ inputs.dry_run }}
 
   publish-aws-lambda:
     name: "Publish AWS Lambda"

scripts/docker-release/build_docker.sh

@@ -34,8 +34,8 @@ then
   then
       echo "ERROR: Pulling images from Sonatype Nexus repo requires cURL to be installed" && exit 1
   fi
-  curl -L -s -o apm-agent-java.jar \
-    "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=co.elastic.apm&a=elastic-apm-agent&v=$RELEASE_VERSION"
+  curl -L -s --fail-with-body -o apm-agent-java.jar \
+    "https://repo1.maven.org/maven2/co/elastic/apm/elastic-apm-agent/$RELEASE_VERSION/elastic-apm-agent-$RELEASE_VERSION.jar"
   else
     echo "ERROR: No suitable build artifact was found. Re-running this script with the SONATYPE_FALLBACK variable set to true will try to use the Sonatype artifact for the latest tag"
     exit 1