[CI] Refactors duplicated Dockerfile

Author: picandocodigo

.buildkite/Dockerfile

@@ -1,14 +1,33 @@
 ARG RUBY_VERSION=${RUBY_VERSION:-3.1}
 FROM ruby:$RUBY_VERSION
 
-ENV QUIET=true
-ENV CI=true
+# Default UID/GID to 1000
+# it can be overridden at build time
+ARG BUILDER_UID=1000
+ARG BUILDER_GID=1000
+ENV BUILDER_USER elastic
+ENV BUILDER_GROUP elastic
+
+ARG QUIET=${QUIET:-true}
+ARG CI=${CI:-false}
+ENV QUIET=$QUIET
+ENV CI=$CI
 
 # Install required tools
-RUN apt-get -q update && apt-get -y install zip curl
+RUN apt-get -q update \
+    && apt-get -y install zip curl
+
+# Create user
+RUN groupadd --system -g ${BUILDER_GID} ${BUILDER_GROUP} \
+    && useradd --system --shell /bin/bash -u ${BUILDER_UID} -g ${BUILDER_GROUP} -d /var/lib/elastic -m elastic 1>/dev/null 2>/dev/null \
+    && mkdir -p /usr/src/app && touch /Gemfile.lock \
+    && chown -R ${BUILDER_USER}:${BUILDER_GROUP} /usr/src/app /Gemfile.lock
+
+COPY --chown=$BUILDER_USER:$BUILDER_GROUP . .
 
 WORKDIR /usr/src/app
-COPY . .
+
+USER ${BUILDER_USER}:${BUILDER_GROUP}
 
 RUN bundle install \
     && bundle exec rake bundle:clean \

.ci/Dockerfile

@@ -38,14 +38,14 @@ output_folder=".ci/output"
 codegen_folder=".ci/output"
 OUTPUT_DIR="$repo/${output_folder}"
 REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
-RUBY_TEST_VERSION=${RUBY_TEST_VERSION-3.1}
+RUBY_VERSION=${RUBY_VERSION-3.1}
 WORKFLOW=${WORKFLOW-staging}
 mkdir -p "$OUTPUT_DIR"
 
 echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m RUBY_TEST_VERSION ${RUBY_TEST_VERSION}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m RUBY_VERSION ${RUBY_VERSION}\033[0m"
 
 case $CMD in
     clean)
@@ -126,7 +126,7 @@ echo -e "\033[1m>>>>> Build [elastic/elasticsearch-ruby container] >>>>>>>>>>>>>
 # ------------------------------------------------------- #
 
 echo -e "\033[34;1mINFO: building $product container\033[0m"
-docker build --build-arg BUILDER_UID="$(id -u)" --file .ci/Dockerfile --tag ${product} .
+docker build --no-cache --build-arg BUILDER_UID="$(id -u)" --file .buildkite/Dockerfile --tag ${product} .
 
 # ------------------------------------------------------- #
 # Run the Container
@@ -142,7 +142,7 @@ args_string="${args_string// /,}"
 
 docker run \
        -u "$(id -u)" \
-       --env "RUBY_TEST_VERSION=${RUBY_TEST_VERSION}" \
+       --env "RUBY_VERSION=${RUBY_VERSION}" \
        --env "WORKFLOW=${WORKFLOW}" \
        --name test-runner \
        --volume "${REPO_BINDING}" \