Change build path for linux binaries to match GOARCH.

aws-observability · Jan 19, 2022 · a8bd382 · a8bd382
1 parent a849204
commit a8bd382
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 56 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -249,8 +249,8 @@ jobs:
       - name: Build RPM
         if: steps.cached_rpms.outputs.cache-hit != 'true'
         run: |
-          ARCH=x86_64 DEST=$PACKAGING_ROOT/linux/amd64 tools/packaging/linux/create_rpm.sh
-          ARCH=aarch64 DEST=$PACKAGING_ROOT/linux/arm64 tools/packaging/linux/create_rpm.sh
+          ARCH=x86_64 SOURCE_ARCH=amd64 DEST=$PACKAGING_ROOT/linux/amd64 tools/packaging/linux/create_rpm.sh
+          ARCH=aarch64 SOURCE_ARCH=arm64 DEST=$PACKAGING_ROOT/linux/arm64 tools/packaging/linux/create_rpm.sh
 
       - name: Download Package Signing GPG key
         if: steps.cached_rpms.outputs.cache-hit != 'true'
@@ -307,8 +307,8 @@ jobs:
       - name: Build Debs
         if: steps.cached_debs.outputs.cache-hit != 'true'
         run: |
-          ARCH=amd64 TARGET_SUPPORTED_ARCH=x86_64 DEST=$PACKAGING_ROOT/debian/amd64 tools/packaging/debian/create_deb.sh
-          ARCH=arm64 TARGET_SUPPORTED_ARCH=aarch64 DEST=$PACKAGING_ROOT/debian/arm64 tools/packaging/debian/create_deb.sh
+          ARCH=amd64 DEST=$PACKAGING_ROOT/debian/amd64 tools/packaging/debian/create_deb.sh
+          ARCH=arm64 DEST=$PACKAGING_ROOT/debian/arm64 tools/packaging/debian/create_deb.sh
 
       - name: Download Package Signing GPG key
         if: steps.cached_debs.outputs.cache-hit != 'true'

diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml
@@ -156,8 +156,8 @@ jobs:
 
       - name: Build RPM
         run: |
-          ARCH=x86_64 DEST=build/packages/linux/amd64 tools/packaging/linux/create_rpm.sh
-          ARCH=aarch64 DEST=build/packages/linux/arm64 tools/packaging/linux/create_rpm.sh
+          ARCH=x86_64 SOURCE_ARCH=amd64 DEST=build/packages/linux/amd64 tools/packaging/linux/create_rpm.sh
+          ARCH=aarch64 SOURCE_ARCH=arm64 DEST=build/packages/linux/arm64 tools/packaging/linux/create_rpm.sh
         if: ${{ needs.changes.outputs.changed == 'true' }}
 
   packaging-deb:
@@ -177,8 +177,8 @@ jobs:
 
       - name: Build Debs
         run: |
-          ARCH=amd64 TARGET_SUPPORTED_ARCH=x86_64 DEST=build/packages/debian/amd64 tools/packaging/debian/create_deb.sh
-          ARCH=arm64 TARGET_SUPPORTED_ARCH=aarch64 DEST=build/packages/debian/arm64 tools/packaging/debian/create_deb.sh
+          ARCH=amd64 DEST=build/packages/debian/amd64 tools/packaging/debian/create_deb.sh
+          ARCH=arm64 DEST=build/packages/debian/arm64 tools/packaging/debian/create_deb.sh
         if: ${{ needs.changes.outputs.changed == 'true' }}
 
   get-test-cases:
@@ -248,3 +248,5 @@ jobs:
           if [[ -f testing-framework/terraform/testcases/${{ matrix.testcase }}/parameters.tfvars ]] ; then opts="-var-file=../testcases/${{ matrix.testcase }}/parameters.tfvars" ; else opts="" ; fi
           cd testing-framework/terraform/mock && terraform init && terraform apply -auto-approve -var="testcase=../testcases/${{ matrix.testcase }}" $opts
         if: ${{ needs.changes.outputs.changed == 'true' }}
+        env:
+          DOCKER_BUILDKIT: 1 # Required for TARGETARCH to be populated with Docker compose.
diff --git a/Makefile b/Makefile
@@ -77,23 +77,23 @@ all-srcs:
 
 .PHONY: build
 build: install-tools lint multimod-verify
-	GOOS=darwin GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/darwin/aoc_darwin_amd64 ./cmd/awscollector
-	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/aoc_linux_x86_64 ./cmd/awscollector
-	GOOS=linux GOARCH=arm64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/aoc_linux_aarch64 ./cmd/awscollector
-	GOOS=windows GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/windows/aoc_windows_amd64 ./cmd/awscollector
+	GOOS=darwin GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/darwin/amd64/aoc ./cmd/awscollector
+	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/amd64/aoc ./cmd/awscollector
+	GOOS=linux GOARCH=arm64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/arm64/aoc ./cmd/awscollector
+	GOOS=windows GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/windows/amd64/aoc ./cmd/awscollector
 
 .PHONY: amd64-build
 amd64-build: install-tools lint multimod-verify
-	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/aoc_linux_x86_64 ./cmd/awscollector
+	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/amd64/aoc ./cmd/awscollector
 
 .PHONY: arm64-build
 arm64-build: install-tools lint multimod-verify
-	GOOS=linux GOARCH=arm64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/aoc_linux_aarch64 ./cmd/awscollector
+	GOOS=linux GOARCH=arm64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/arm64/aoc ./cmd/awscollector
 
 # For building container image during development, no lint nor other platforms
 .PHONY: amd64-build-only
 amd64-build-only:
-	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/aoc_linux_x86_64 ./cmd/awscollector
+	GOOS=linux GOARCH=amd64 $(GOBUILD) $(LDFLAGS) -o ./build/linux/amd64/aoc ./cmd/awscollector
 
 .PHONY: awscollector
 awscollector:
@@ -102,12 +102,12 @@ awscollector:
 
 .PHONY: package-rpm
 package-rpm: build
-	ARCH=x86_64 DEST=build/packages/linux/amd64 tools/packaging/linux/create_rpm.sh
+	ARCH=x86_64 SOURCE_ARCH=amd64 DEST=build/packages/linux/amd64 tools/packaging/linux/create_rpm.sh
 
 .PHONY: package-deb
 package-deb: build
-	ARCH=amd64 TARGET_SUPPORTED_ARCH=x86_64 DEST=build/packages/debian/amd64 tools/packaging/debian/create_deb.sh
-	ARCH=arm64 TARGET_SUPPORTED_ARCH=aarch64 DEST=build/packages/debian/arm64 tools/packaging/debian/create_deb.sh
+	ARCH=amd64 DEST=build/packages/debian/amd64 tools/packaging/debian/create_deb.sh
+	ARCH=arm64 DEST=build/packages/debian/arm64 tools/packaging/debian/create_deb.sh
 
 .PHONY: docker-build
 docker-build: amd64-build

diff --git a/cmd/awscollector/Dockerfile b/cmd/awscollector/Dockerfile
@@ -9,16 +9,13 @@ RUN apk --update add ca-certificates
 
 WORKDIR /workspace
 
-ARG TARGETPLATFORM
-RUN echo "Target platform is $TARGETPLATFORM"
+ARG TARGETARCH
 
 # copy artifacts
 # always assume binary is created
-COPY build/linux/* /workspace/
+COPY build/linux/$TARGETARCH/aoc /workspace/awscollector
 COPY config.yaml /workspace/config/otel-config.yaml
 COPY config/ /workspace/config/
-COPY cmd/awscollector/copy_docker_binary.sh /workspace/copy_binary.sh
-RUN ./copy_binary.sh
 
 ################################
 #	Final Stage            #	
@@ -27,7 +24,7 @@ RUN ./copy_binary.sh
 FROM scratch
 
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=build /workspace/build/linux/aoc_linux /awscollector
+COPY --from=build /workspace/awscollector /awscollector
 COPY --from=build /workspace/config/ /etc/
 
 ENV RUN_IN_CONTAINER="True"

diff --git a/cmd/awscollector/copy_docker_binary.sh b/cmd/awscollector/copy_docker_binary.sh
diff --git a/tools/packaging/debian/control b/tools/packaging/debian/control
@@ -2,4 +2,4 @@ Section: admin
 Depends: libc6
 Priority: optional
 Maintainer: Amazon.com, Inc.
-Description: Amazon AWS Opentelemetry Collector
+Description: Amazon AWS OpenTelemetry Collector
diff --git a/tools/packaging/debian/create_deb.sh b/tools/packaging/debian/create_deb.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
@@ -11,8 +13,6 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-#!/usr/bin/env bash
-
 set -e
 
 echo "****************************************"
@@ -45,7 +45,7 @@ mkdir -p ${AOC_ROOT}/var/run/amazon
 echo "Copying application files"
 cp LICENSE ${AOC_ROOT}/opt/aws/aws-otel-collector/
 cp VERSION ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/
-cp build/linux/aoc_linux_${TARGET_SUPPORTED_ARCH} ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/aws-otel-collector
+cp build/linux/${ARCH}/aoc ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/aws-otel-collector
 cp tools/ctl/linux/aws-otel-collector-ctl ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/
 cp config.yaml ${AOC_ROOT}/opt/aws/aws-otel-collector/etc
 cp .env ${AOC_ROOT}/opt/aws/aws-otel-collector/etc

diff --git a/tools/packaging/linux/create_rpm.sh b/tools/packaging/linux/create_rpm.sh
@@ -48,7 +48,7 @@ cp VERSION ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/
 cp docs/releases/${VERSION}.md ${AOC_ROOT}/opt/aws/aws-otel-collector/RELEASE_NOTE
 
 # binary
-cp build/linux/aoc_linux_${ARCH} ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/aws-otel-collector
+cp build/linux/${SOURCE_ARCH}/aoc ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/aws-otel-collector
 # ctl
 cp tools/ctl/linux/aws-otel-collector-ctl ${AOC_ROOT}/opt/aws/aws-otel-collector/bin/
 # default config

diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs
@@ -51,7 +51,7 @@ Platform="x64"
 
     <DirectoryRef Id="INSTALLDIR">
     <Component Id="ApplicationComponent" Guid="5f344c26-c8f5-4a10-83c0-0651399fb8ff" Win64='yes'>
-    <File Id="ExecutableFile" Name=".aws-otel-collector.exe" KeyPath="yes" Source="./build/windows/aoc_windows_amd64"/>
+    <File Id="ExecutableFile" Name=".aws-otel-collector.exe" KeyPath="yes" Source="./build/windows/amd64/aoc"/>
     <ServiceInstall
 Id="Sevice"
 Name="AWSOTelCollector"