Artifact name modification for docker packages

This commit is contained in:
Deda 2024-03-22 10:58:54 +01:00
parent 86b4e9e87f
commit 144a650dc0
2 changed files with 6 additions and 9 deletions

View File

@ -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 }}/"

View File

@ -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