chore: docker build fixes

.github/workflows/build.yml

@@ -5,10 +5,16 @@ permissions: read-all
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - docker-full
+          - docker-minimal
     steps:
       - name: Checkout code
         uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
       - name: Build Container
-        run: make docker
+        run: make ${{matrix.target}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -82,15 +82,18 @@ generate: .bin/controller-gen
 	.bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 
 # Build the docker image
-docker:
-	docker build . -f build/full/Dockerfile -t ${IMG_F}
+docker: docker-minimal docker-full
+
+docker-full:
+	docker build . -f build/full/Dockerfile -t ${IMG}
+
+docker-minimal:
 	docker build . -f build/minimal/Dockerfile -t ${IMG}
 
 # Build the docker image
 docker-dev: linux
 	docker build ./ -f build/dev/Dockerfile -t ${IMG}
 
-
 docker-push-%:
 	docker build . -f build/full/Dockerfile -t ${IMG_F}
 	docker build . -f build/minimal/Dockerfile -t ${IMG}

build/full/Dockerfile

@@ -56,7 +56,7 @@ RUN curl -L https://github.com/restic/restic/releases/download/v${RESTIC_VERSION
 
 ENV JMETER_VERSION=5.6.2
 RUN curl -L https://dlcdn.apache.org//jmeter/binaries/apache-jmeter-${JMETER_VERSION}.zip -o apache-jmeter-${JMETER_VERSION}.zip && \
-  unzip apache-jmeter-${JMETER_VERSION}.zip -q -d /opt && \
+  unzip -q apache-jmeter-${JMETER_VERSION}.zip -d /opt && \
   rm apache-jmeter-${JMETER_VERSION}.zip
 
 ENV PATH /opt/apache-jmeter-${JMETER_VERSION}/bin/:$PATH
@@ -78,7 +78,7 @@ RUN curl -Lsf https://sh.benthos.dev | bash -s -- 4.22.0
 
 # Commandline tool for running SQL queries against JSON, CSV, Excel, Parquet, and more
 RUN curl -L https://github.com/multiprocessio/dsq/releases/download/v0.23.0/dsq-linux-x64-v0.23.0.zip -o dsq.zip && \
-  unzip dsq.zip -q && \
+  unzip -q dsq.zip && \
   mv dsq /usr/local/bin/dsq && \
   rm dsq.zip
 
@@ -99,7 +99,7 @@ ENV PATH="${PATH}:/var/lib/canary/bin/"
 
 # Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-  unzip awscliv2.zip -q && ./aws/install -i ${HOME}/aws -b ${HOME}/bin/ && \
+  unzip -q awscliv2.zip && ./aws/install -i ${HOME}/aws -b ${HOME}/bin/ && \
   rm awscliv2.zip
 
 # Install GCP CLI

build/minimal/Dockerfile

@@ -48,7 +48,7 @@ ENV PATH="${PATH}:/var/lib/canary/bin/"
 
 # Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-  unzip awscliv2.zip -q && ./aws/install -i ${HOME}/aws -b ${HOME}/bin/ && \
+  unzip -q awscliv2.zip && ./aws/install -i ${HOME}/aws -b ${HOME}/bin/ && \
   rm awscliv2.zip
 
 # Install GCP CLI