Merge pull request #35 from seek-oss/inline-dockerfile

Author: 72636c

README.md

@@ -89,6 +89,23 @@ steps:
       - docker#v3.3.0
 ```
 
+Alternatively, Dockerfile can be embedded inline:
+
+```yaml
+steps:
+  - command: echo wow
+    plugins:
+      - seek-oss/docker-ecr-cache#v1.9.0:
+          dockerfile-inline: |
+            FROM node:16-alpine
+            WORKDIR /workdir
+            COPY package.json package-lock.json /workdir
+            RUN npm install
+
+
+      - docker#v3.3.0
+```
+
 ### Specifying a target step
 
 A [multi-stage Docker build] can be used to reduce an application container to

hooks/lib/stdlib.bash

@@ -51,7 +51,7 @@ compute_tag() {
 
   echoerr 'DOCKERFILE'
   echoerr "+ ${docker_file}:${target:-"<target>"}"
-  sums="$(sha1sum "${docker_file}")"
+  sums="$(cd ${docker_file_dir}; sha1sum $(basename ${docker_file}))"
   sums+="$(echo "${target}" | sha1sum)"
 
   echoerr 'ARCHITECTURE'

hooks/pre-command

@@ -9,13 +9,26 @@ source "$(dirname "${BASH_SOURCE[0]}")/lib/${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_R
 login
 configure_registry_for_image_if_necessary
 image="$(get_registry_url)"
-docker_file="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE:-"Dockerfile"}"
+if [ -n "${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE_INLINE:-}" ]
+then
+  [ -n "${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE:-}" ] &&
+    log_fatal "Cannot specify both 'dockerfile' and 'dockerfile-inline'."
+  # Put the Dockerfile into a temporary directory to work around
+  # https://github.com/docker/cli/issues/2249
+  docker_file_dir="$(mktemp -d)"
+  docker_file="${docker_file_dir}/Dockerfile"
+  echo "$BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE_INLINE" > "$docker_file"
+  context_dir="."
+else
+  docker_file="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE:-"Dockerfile"}"
+  context_dir="$(dirname "${docker_file}")"
+  docker_file_dir="${context_dir}"
+fi
 target="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_TARGET:-}"
 export_env_variable="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_ENV_VARIABLE:-"BUILDKITE_PLUGIN_DOCKER_IMAGE"}"
 exec 3>&1
 tag="$(compute_tag "${docker_file}" 2>&3)"
-docker_file_dir="$(dirname "${docker_file}")"
-context="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_CONTEXT:-"${docker_file_dir}"}"
+context="${BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_CONTEXT:-"${context_dir}"}"
 
 build_args=()
 read_build_args

tests/pre-command.bats

@@ -67,3 +67,33 @@ pre_command_hook="$PWD/hooks/pre-command"
 
   unstub docker
 }
+
+@test "Tags and pushes with inline Dockerfile" {
+  export BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_REGISTRY_PROVIDER="stub"
+  export BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_DOCKERFILE_INLINE="FROM stub"
+  local repository_uri="pretend.host/path/segment/image"
+
+  one_time_mktemp=$(mktemp -d)
+
+  stub mktemp \
+    "-d : echo $one_time_mktemp"
+
+  stub docker \
+    "pull * : false" \
+    "build --file=$one_time_mktemp/Dockerfile * : echo building docker image" \
+    "tag ${repository_uri}:stubbed-computed-tag ${repository_uri}:latest : echo tagged latest" \
+    "push ${repository_uri}:stubbed-computed-tag : echo pushed stubbed-computed-tag" \
+    "push ${repository_uri}:latest : echo pushed latest"
+  run "${pre_command_hook}"
+
+  assert_success
+  assert_line "--- Pulling image"
+  assert_line "--- Building image"
+  assert_line "--- Pushing tag stubbed-computed-tag"
+  assert_line "--- Pushing tag latest"
+
+  assert_equal "FROM stub" "$(cat ${one_time_mktemp}/Dockerfile)"
+
+  unstub mktemp
+  unstub docker
+}