Retrieve the UID for the mysql user and pass in when building the

mysql-agent image, rather than hardcoding a UID in the Dockerfile.

Signed-off-by: Kashif Saadat <kashifsaadat@gmail.com>

Author: KashifSaadat

Makefile

@@ -78,9 +78,14 @@ build-docker:
 	-t $(REGISTRY)/$(TENANT)/mysql-operator:$(VERSION) \
 	-f docker/mysql-operator/Dockerfile .
 
+	# Retrieve the UID for the mysql user, passed in when building the mysql-agent image
+	$(eval MYSQL_AGENT_IMAGE := $(shell sed -n 's/^FROM \(.*\)/\1/p' docker/mysql-agent/Dockerfile))
+	$(eval MYSQL_UID=$(shell docker run --rm --entrypoint id ${MYSQL_AGENT_IMAGE} -u mysql))
+
 	@docker build \
 	--build-arg=http_proxy \
 	--build-arg=https_proxy \
+	--build-arg=MYSQL_USER=${MYSQL_UID} \
 	-t $(REGISTRY)/$(TENANT)/mysql-agent:$(VERSION) \
 	-f docker/mysql-agent/Dockerfile .
 

docker/mysql-agent/Dockerfile

@@ -2,7 +2,8 @@ FROM mysql/mysql-server:8.0.12
 
 COPY bin/linux_amd64/mysql-agent /
 
-# Reference the UID for the 'mysql' user
-USER 27
+# Set default value for 'MYSQL_USER', which is overridden with the UID at build time
+ARG MYSQL_USER=mysql
+USER ${MYSQL_USER}
 
 ENTRYPOINT ["/mysql-agent"]