Add build args, custom_build and test workflows

- Added build args in dockerfile for moduels and redis version
- Added custom_build input to use in dockerfile and build-and-tag-locally
- Created test workflow to run unsable build

Author: dariaguy

.github/actions/apply-docker-version/apply-docker-version.sh

@@ -57,19 +57,19 @@ update_dockerfile() {
     echo "Updating $dockerfile..."
 
     # Update REDIS_DOWNLOAD_URL
-    if grep -q "^ENV REDIS_DOWNLOAD_URL=" "$dockerfile"; then
-        sed -i "s|^ENV REDIS_DOWNLOAD_URL=.*|ENV REDIS_DOWNLOAD_URL=$REDIS_ARCHIVE_URL|" "$dockerfile"
+    if grep -q "^ARG REDIS_DOWNLOAD_URL=" "$dockerfile"; then
+        sed -i "s|^ARG REDIS_DOWNLOAD_URL=.*|ARG REDIS_DOWNLOAD_URL=$REDIS_ARCHIVE_URL|" "$dockerfile"
     else
-        echo "Cannot update $dockerfile, ENV REDIS_DOWNLOAD_URL not found"
+        echo "Cannot update $dockerfile, ARG REDIS_DOWNLOAD_URL not found"
         return 1
     fi
 
 
     # Update REDIS_DOWNLOAD_SHA
-    if grep -q "^ENV REDIS_DOWNLOAD_SHA=" "$dockerfile"; then
-        sed -i "s|^ENV REDIS_DOWNLOAD_SHA=.*|ENV REDIS_DOWNLOAD_SHA=$REDIS_ARCHIVE_SHA|" "$dockerfile"
+    if grep -q "^ARG REDIS_DOWNLOAD_SHA=" "$dockerfile"; then
+        sed -i "s|^ARG REDIS_DOWNLOAD_SHA=.*|ARG REDIS_DOWNLOAD_SHA=$REDIS_ARCHIVE_SHA|" "$dockerfile"
     else
-        echo "Cannot update $dockerfile, ENV REDIS_DOWNLOAD_SHA not found"
+        echo "Cannot update $dockerfile, ARG REDIS_DOWNLOAD_SHA not found"
         return 1
     fi
 }

.github/actions/build-and-tag-locally/action.yml

@@ -35,6 +35,9 @@ inputs:
   redistimeseries_version:
     description: 'Redistimeseries version to build'
     required: false
+  custom_build:
+    description: 'Type of custom release, branch tag or commit. Empty for release'
+    required: false
 
 runs:
   using: "composite"
@@ -100,6 +103,21 @@ runs:
         username: ${{ inputs.registry_username }}
         password: ${{ inputs.registry_password }}
 
+    - name: Redis release archive
+      shell: bash
+      if: inputs.custom_build != ''
+      run: |
+        if [[ "${{ inputs.custom_build }}" == "branch" ]]; then
+            echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/${{ inputs.release_tag }}.tar.gz" >> "$GITHUB_ENV"
+        elif [[ "${{ inputs.custom_build }}" == "tag" ]]; then
+            echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/${{ inputs.release_tag }}.tar.gz" >> "$GITHUB_ENV"
+        elif [[ "${{ inputs.custom_build }}" == "commit" ]]; then
+            echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/${{ inputs.release_tag }}.tar.gz" >> "$GITHUB_ENV"
+        else
+            echo "Wrong custom_build, available options are tag, branch and "commit"
+            exit 1
+        fi
+
     - name: Build
       uses: docker/build-push-action@v6
       with:
@@ -115,6 +133,7 @@ runs:
           REDISJSON_VERSION=${{ inputs.redisjson_version }}
           REDISBLOOM_VERSION=${{ inputs.redisbloom_version }}
           REDISTIMESERIES_VERSION=${{ inputs.redistimeseries_version }}
+          ${{ inputs.custom_build != '' && format('CUSTOM_BUILD=true\nREDIS_DOWNLOAD_URL={0}', env.REDIS_DOWNLOAD_URL) || '' }}
 
     - name: Run container
       shell: bash
@@ -267,6 +286,7 @@ runs:
           REDISJSON_VERSION=${{ inputs.redisjson_version }}
           REDISBLOOM_VERSION=${{ inputs.redisbloom_version }}
           REDISTIMESERIES_VERSION=${{ inputs.redistimeseries_version }}
+          ${{ inputs.custom_build != '' && format('CUSTOM_BUILD=true\nREDIS_DOWNLOAD_URL={0}', env.REDIS_DOWNLOAD_URL) || '' }}
         labels: |
             ${{ steps.get-image-labels.outputs.image_labels }}
             org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}

.github/workflows/pre-merge.yml

@@ -32,6 +32,10 @@ on:
         required: false
         type: boolean
         default: false
+      custom_build:
+        description: 'Run type, either branch, tag or commit. Empty for releases'
+        required: false
+        type: string
     outputs:
       docker_images_metadata:
         description: 'Array of structured Docker images metadata that were published'
@@ -73,7 +77,7 @@ jobs:
             || ''
             }}
       - name: Ensure release branch
-        if: inputs.release_tag != '' && inputs.release_tag != 'unstable'
+        if: inputs.release_tag != '' && inputs.release_tag != 'unstable' && inputs.custom_build == ''
         uses: redis-developer/redis-oss-release-automation/.github/actions/ensure-release-branch@main
         with:
           release_tag: ${{ inputs.release_tag }}
@@ -91,6 +95,7 @@ jobs:
           redisjson_version: ${{ inputs.redisjson_version }}
           redisbloom_version: ${{ inputs.redisbloom_version }}
           redistimeseries_version: ${{ inputs.redistimeseries_version }}
+          custom_build: ${{ inputs.custom_build }}
 
   collect-images-metadata:
     runs-on: ubuntu-latest

.github/workflows/test-nightly-unstable.yml

@@ -0,0 +1,17 @@
+name: Test Nightly Unstable Build and Package
+on:
+  push:
+    branches:
+      - unstable-alignment
+
+jobs:
+  build-and-test-unstable:
+    uses: redis/docker-library-redis/.github/workflows/pre-merge.yml
+    with:
+      release_tag: unstable
+      redisearch_version: master
+      redisjson_version: master
+      redisbloom_version: master
+      redistimeseries_version: master
+      publish_image: false
+      custom_build: branch