PMM-13487 Package build.json with the docker image

percona · Dec 14, 2024 · b7854bf · b7854bf
1 parent 49b9319
commit b7854bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build/docker/server/Dockerfile.el9 b/build/docker/server/Dockerfile.el9
@@ -22,7 +22,8 @@ RUN microdnf -y install epel-release && \
 COPY entrypoint.sh /opt/entrypoint.sh
 COPY ansible /opt/ansible
 COPY RPMS /tmp/RPMS
-COPY gitCommit /tmp/gitCommit
+COPY gitCommit /tmp/
+COPY build.json /tmp/
 
 # Use COPY as we want to unarchive it with ansible
 COPY pmm-client.tar.gz /tmp/

diff --git a/build/scripts/build-server-docker b/build/scripts/build-server-docker
@@ -12,6 +12,11 @@ main() {
   cp -r "${pmm_build_dir}/ansible" "${docker_root}/ansible"
   cp "${pmm_build_dir}/docker/server/"* "${docker_root}"
   cp ${build_dir}/tarball/pmm-client-*.tar.gz "${docker_root}/pmm-client.tar.gz"
+  if [ -s "${root_dir}/build/build.json" ]; then
+    cp "${root_dir}/build/build.json" "${docker_root}/build.json"
+  else
+    echo -n "{}" > "${docker_root}/build.json"
+  fi
 
   if [ -n "$CI" ]; then
     git -C ${root_dir} rev-parse HEAD > ${docker_root}/gitCommit