fix: support Docker builds to copy drone cli

harness · Oct 27, 2022 · 30b15f0 · 30b15f0
1 parent 6b58813
commit 30b15f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
@@ -31,20 +31,19 @@ RUN chmod +x /tools/darwin/yq \
 # End Download yq
 
 ## Copy Drone CLI
-COPY "${DRONE_WORKSPACE}/bin/drone-cli/darwin/${TARGETARCH}/drone" /tools/darwin/drone
-COPY "${DRONE_WORKSPACE}/bin/drone-cli/linux/${TARGETARCH}/drone" /tools/linux/drone
-COPY "${DRONE_WORKSPACE}/bin/drone-cli/windows/$TARGETARCH/drone.exe" /tools/windows/drone.exe
-RUN chmod +x /tools/darwin/drone \
-  && chmod +x /tools/linux/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_darwin_${TARGETARCH}/drone" /tools/darwin/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_linux_${TARGETARCH}/drone"  /tools/linux/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_windows_${TARGETARCH}/drone.exe"  /tools/windows/drone.exe
+
+RUN chmod +x /tools/darwin/drone /tools/linux/drone 
 
 ## Copy pipelines-finder
 
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_darwin_${TARGETARCH}_${ARCH_VERSION}"/pipelines-finder  /tools/darwin/pipelines-finder
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_linux_${TARGETARCH}_${ARCH_VERSION}"/pipelines-finder  /tools/linux/pipelines-finder
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_windows_${TARGETARCH}_${ARCH_VERSION}"/pipelines-finder.exe  /tools/windows/pipelines-finder.exe
 
-RUN chmod +x /tools/darwin/pipelines-finder \
-   && chmod + /tools/linux/pipelines-finder
+RUN chmod +x /tools/darwin/pipelines-finder /tools/linux/pipelines-finder
 
 # COPY backend service
 COPY "${DRONE_WORKSPACE}/backend/dist/backend_linux_${TARGETARCH}_${ARCH_VERSION}/backend"  /backend

diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
@@ -29,19 +29,19 @@ RUN chmod +x /tools/darwin/yq \
 # End Download yq
 
 ## Copy Drone CLI
-COPY "${DRONE_WORKSPACE}/bin/drone-cli/darwin/${TARGETARCH}/drone" /tools/darwin/drone
-COPY "${DRONE_WORKSPACE}/bin/drone-cli/linux/${TARGETARCH}/drone" /tools/linux/drone
-RUN chmod +x /tools/darwin/drone \
-  && chmod +x /tools/linux/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_darwin_${TARGETARCH}/drone" /tools/darwin/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_linux_${TARGETARCH}/drone"  /tools/linux/drone
+COPY "${DRONE_WORKSPACE}/backend/dist/drone_windows_${TARGETARCH}/drone.exe"  /tools/windows/drone.exe
+
+RUN chmod +x /tools/darwin/drone /tools/linux/drone
 
 ## Copy pipelines-finder
 
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_darwin_${TARGETARCH}/pipelines-finder" /tools/darwin/pipelines-finder
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_linux_${TARGETARCH}/pipelines-finder"  /tools/linux/pipelines-finder
 COPY "${DRONE_WORKSPACE}/backend/dist/pipelines-finder_windows_${TARGETARCH}/pipelines-finder.exe"  /tools/windows/pipelines-finder.exe
 
-RUN chmod +x /tools/darwin/pipelines-finder \
-   && chmod + /tools/linux/pipelines-finder
+RUN chmod +x /tools/darwin/pipelines-finder /tools/linux/pipelines-finder
 
 # COPY backend service
 COPY "${DRONE_WORKSPACE}/backend/dist/backend_linux_${TARGETARCH}/backend"  /backend