modify devspace Dockerfile to build linux/amd64 images on ARM chips +…

… remove some whitespaces (#11941)
smartcontractkit · Feb 6, 2024 · e0da2ca · e0da2ca
1 parent b3ec54a
commit e0da2ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
@@ -34,8 +34,8 @@ pipelines:
       echo "Authorizing into ECR registry"
       aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${registry_id}.dkr.ecr.us-west-2.amazonaws.com
 
-      run_dependencies --all                           
-      ensure_pull_secrets --all                         
+      run_dependencies --all
+      ensure_pull_secrets --all
       build_images ---var DOCKER_DEFAULT_PLATFORM=linux/amd64  --all -t $(git rev-parse --short HEAD)
       kubectl annotate namespace ${DEVSPACE_NAMESPACE} janitor/ttl=${NS_TTL} || true
       kubectl label namespace/${DEVSPACE_NAMESPACE} network=crib || true
@@ -63,7 +63,7 @@ pipelines:
       else
         echo "Image tag '$tag' not found. Please build the image using 'devspace deploy'"
         exit 1
-      fi 
+      fi
       create_deployments app \
       --set=helm.values.chainlink.nodes[0].image=$image \
       --set=helm.values.chainlink.nodes[1].image=$image \

diff --git a/charts/chainlink-cluster/devspace_start.sh b/charts/chainlink-cluster/devspace_start.sh
@@ -7,9 +7,9 @@ COLOR_RESET="\033[0m"
 
 # Print useful output for user
 echo -e "${COLOR_BLUE}
-     %########%      
-     %###########%       ____                 _____                      
-         %#########%    |  _ \   ___ __   __ / ___/  ____    ____   ____ ___ 
+     %########%
+     %###########%       ____                 _____
+         %#########%    |  _ \   ___ __   __ / ___/  ____    ____   ____ ___
          %#########%    | | | | / _ \\\\\ \ / / \___ \ |  _ \  / _  | / __// _ \\
      %#############%    | |_| |(  __/ \ V /  ____) )| |_) )( (_| |( (__(  __/
      %#############%    |____/  \___|  \_/   \____/ |  __/  \__,_| \___\\\\\___|

diff --git a/core/chainlink.devspace.Dockerfile b/core/chainlink.devspace.Dockerfile
@@ -1,5 +1,5 @@
 # Build image: Chainlink binary
-FROM golang:1.21-bullseye as buildgo
+FROM golang:1.21-bullseye AS buildgo
 RUN go version
 WORKDIR /chainlink
 
@@ -22,7 +22,7 @@ RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs
 RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana
 
 # Build image: Plugins
-FROM golang:1.21-bullseye as buildplugins
+FROM golang:1.21-bullseye AS buildplugins
 RUN go version
 
 WORKDIR /chainlink-feeds
@@ -34,7 +34,7 @@ COPY --from=buildgo /chainlink-solana .
 RUN go install ./pkg/solana/cmd/chainlink-solana
 
 # Final image: ubuntu with chainlink binary
-FROM golang:1.21-bullseye
+FROM --platform=linux/amd64 golang:1.21-bullseye
 
 ARG CHAINLINK_USER=chainlink
 ENV DEBIAN_FRONTEND noninteractive