Merge pull request #1856 from ConnorJC3/optimize-runsh-makefile

Refactor the Makefile and hack/ scripts

.dockerignore

@@ -0,0 +1,8 @@
+.github/
+.idea/
+bin/
+hack/
+charts/
+deploy/
+docs/
+examples/

.github/workflows/publish-ecr.yaml

@@ -39,7 +39,7 @@ jobs:
           echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
 
     - name: Build, tag, and push manifest to Amazon ECR
-      run: make -j `nproc` all-push
+      run: make -j `nproc` all-push-with-a1compat
 
   ecr-public:
     name: Push to ECR Public

.gitignore

@@ -33,3 +33,7 @@ vendor/
 
 # Files used by Makefile when upgrading sidecars
 hack/release-scripts/image-digests.yaml
+
+# E2E artifacts
+_rundir/
+_artifacts/

Dockerfile

@@ -24,7 +24,7 @@ COPY . .
 ARG TARGETOS
 ARG TARGETARCH
 ARG VERSION
-RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
+RUN OS=$TARGETOS ARCH=$TARGETARCH make
 
 FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al23 AS linux-al2023
 COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver