Merge pull request #11 from circleci/ONPREM-1263/task-agent-download

Download task agent binaries directly via the Dockerfile

Author: christian-stephen

.circleci/config.yml

@@ -78,14 +78,12 @@ jobs:
       - notify_failing_main
 
   prepare-agents:
-    machine:
-      image: *linux_machine_image
-      resource_class: large
+    docker:
+      - image: *go_image
+    resource_class: circleci-runner/rum-large
     steps:
       - checkout
-      - docker_login
       - run: ./do build-fake-agents
-      - run: ./do download-taskagents
       - persist_to_workspace:
           root: .
           paths:

CHANGELOG.md

@@ -10,4 +10,5 @@ By following these guidelines, we can easily determine which changes should be i
 
 ## Edge
 
-- [#10] [INTERNAL] Set up linting tools, initiated a changelog, and performed other configurations in preparation for the orchestration agent.
+- [#11](https://github.com/circleci/runner-init/pull/11) [INTERNAL] Download task agent binaries directly via the Dockerfile.
+- [#10](https://github.com/circleci/runner-init/pull/10) [INTERNAL] Set up linting tools, initiated a changelog, and performed other configurations in preparation for the orchestration agent.

do

@@ -5,18 +5,6 @@ set -eu -o pipefail
 reportDir="test-reports"
 GORELEASER_VERSION="v1.26.2"
 
-# This variable is used, but shellcheck can't tell.
-# shellcheck disable=SC2034
-help_download_taskagents="Download task agents via the picard image"
-download-taskagents() {
-    id=$(docker create circleci/picard:agent)
-
-    docker cp "$id":/opt/circleci/linux/amd64/circleci-agent ./bin/circleci-agent-amd64
-    docker cp "$id":/opt/circleci/linux/arm64/circleci-agent ./bin/circleci-agent-arm64
-
-    docker rm -v "$id"
-}
-
 # This variable is used, but shellcheck can't tell.
 # shellcheck disable=SC2034
 help_build_fake_agents="Build the fake agent go binaries"

runner-init/Dockerfile

@@ -1,8 +1,10 @@
+FROM circleci/picard:agent as task-agent-image
+
 FROM busybox:stable-musl
 
 ARG ARCH=amd64
 
-COPY ./bin/circleci-agent-${ARCH} /opt/circleci/circleci-agent
+COPY --from=task-agent-image /opt/circleci/linux/${ARCH}/circleci-agent /opt/circleci/bin/circleci-agent
 COPY ./runner-init/init.sh /init.sh
 
-ENTRYPOINT ["/init.sh"]
+ENTRYPOINT ["/init.sh"]

runner-init/fake-agent.Dockerfile

@@ -2,7 +2,7 @@ FROM busybox:stable-musl as build
 
 ARG ARCH=amd64
 
-COPY ./bin/circleci-fake-agent-${ARCH} /opt/circleci/circleci-agent
+COPY ./bin/circleci-fake-agent-${ARCH} /opt/circleci/bin/circleci-agent
 COPY ./runner-init/init.sh /init.sh
 
-ENTRYPOINT ["/init.sh"]
+ENTRYPOINT ["/init.sh"]

runner-init/init.sh

@@ -2,5 +2,5 @@
 
 dest=${1:?'task agent dest must be specified'}
 
-cp /opt/circleci/circleci-agent "$dest"/circleci-agent
+cp /opt/circleci/bin/circleci-agent "$dest"/circleci-agent
 ln -s "$dest"/circleci-agent "$dest"/circleci