diff --git a/.github/workflows/reusable_docker_package.yaml b/.github/workflows/reusable_docker_package.yaml index f06363dc5..082d667de 100644 --- a/.github/workflows/reusable_docker_package.yaml +++ b/.github/workflows/reusable_docker_package.yaml @@ -25,7 +25,7 @@ on: default: 'Release' artifact_name: type: string - description: "Unique artifact name, pass it in to override the default. Default value is docker-arch." + description: "Unique artifact name, pass it in to override the default. Default value is docker." default: '' additional_build_args: type: string @@ -52,9 +52,6 @@ on: description: "Target dir path in S3 bucket." default: '' -env: - ARTIFACT_NAME: "docker-${{ inputs.arch }}" - jobs: package: runs-on: [self-hosted, DockerMgBuild, "${{ inputs.runner_arch_label }}"] @@ -120,7 +117,7 @@ jobs: - name: "Upload docker package" uses: actions/upload-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }} + name: ${{ inputs.artifact_name }} path: "build/output/docker/${{ inputs.arch }}/${{ inputs.toolchain }}/memgraph*" - name: "Stop mgbuild container" @@ -140,7 +137,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - name: ${{ env.ARTIFACT_NAME }} + name: ${{ inputs.artifact_name }} path: "build/output/release" - name: Upload to S3 @@ -151,4 +148,4 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }} AWS_REGION: ${{ inputs.s3_region }} SOURCE_DIR: "build/output/release" - DEST_DIR: "${{ inputs.s3_dest_dir }}/${{ env.ARTIFACT_NAME }}/" + DEST_DIR: "${{ inputs.s3_dest_dir }}/${{ inputs.artifact_name }}/" diff --git a/release/docker/package_docker b/release/docker/package_docker index bba443d78..84105764e 100755 --- a/release/docker/package_docker +++ b/release/docker/package_docker @@ -75,14 +75,14 @@ else fi image_name="memgraph:${version}" -image_package_name="memgraph-${version}-docker-${arch}.tar.gz" +image_package_name="memgraph-${version}-docker.tar.gz" # Build docker image. # NOTE: --pull is here to always pull that latest base image because of security patches. docker build --pull -t ${image_name} ${tag_latest} -f ${dockerfile_path} \ --build-arg BINARY_NAME=${package_name} \ --build-arg EXTENSION=${extension} \ ---build-arg TARGETARCH="" . +--build-arg TARGETARCH=${arch} . docker save ${image_name} ${latest_image} | gzip > ${image_package_name} rm "${package_name}.${extension}" docker image rm $image_name