Fix dockerfile build for macos

blockscout · Jan 17, 2024 · 304667a · 304667a
1 parent d6a013b
commit 304667a
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 73 deletions.
diff --git a/.github/workflows/bens.yml b/.github/workflows/bens.yml
@@ -113,7 +113,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 60
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/eth-bytecode-db.yml b/.github/workflows/eth-bytecode-db.yml
@@ -115,7 +115,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/multichain-search.yml b/.github/workflows/multichain-search.yml
@@ -94,7 +94,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/sig-provider.yml b/.github/workflows/sig-provider.yml
@@ -95,7 +95,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/smart-contract-verifier.yml b/.github/workflows/smart-contract-verifier.yml
@@ -95,7 +95,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml
@@ -114,7 +114,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/user-ops-indexer.yml b/.github/workflows/user-ops-indexer.yml
@@ -111,7 +111,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/visualizer.yml b/.github/workflows/visualizer.yml
@@ -104,7 +104,7 @@ jobs:
       always() &&
       (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
       (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

diff --git a/eth-bytecode-db/eth-bytecode-db-server/Dockerfile b/eth-bytecode-db/eth-bytecode-db-server/Dockerfile
@@ -1,16 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y curl wget unzip
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
-          && unzip protoc.zip \
-          && mv ./include/* /usr/include/ \
-          && mv ./bin/protoc /usr/bin/protoc
-
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-          && chmod +x protoc-gen-openapiv2 \
-          && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
+    && unzip protoc.zip \
+    && mv ./include/* /usr/include/ \
+    && mv ./bin/protoc /usr/bin/protoc
+
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 FROM chef AS plan
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json

diff --git a/smart-contract-verifier/smart-contract-verifier-http/Dockerfile b/smart-contract-verifier/smart-contract-verifier-http/Dockerfile
@@ -1,15 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y curl wget unzip
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
-          && unzip protoc.zip \
-          && mv ./include/* /usr/include/ \
-          && mv ./bin/protoc /usr/bin/protoc
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-          && chmod +x protoc-gen-openapiv2 \
-          && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
+    && unzip protoc.zip \
+    && mv ./include/* /usr/include/ \
+    && mv ./bin/protoc /usr/bin/protoc
+
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 
 FROM chef AS plan
 COPY . .

diff --git a/smart-contract-verifier/smart-contract-verifier-server/Dockerfile b/smart-contract-verifier/smart-contract-verifier-server/Dockerfile
@@ -1,15 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y curl wget unzip
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
-          && unzip protoc.zip \
-          && mv ./include/* /usr/include/ \
-          && mv ./bin/protoc /usr/bin/protoc
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-          && chmod +x protoc-gen-openapiv2 \
-          && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
+    && unzip protoc.zip \
+    && mv ./include/* /usr/include/ \
+    && mv ./bin/protoc /usr/bin/protoc
+
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 
 FROM chef AS plan
 COPY . .

diff --git a/stats/Dockerfile b/stats/Dockerfile
@@ -1,15 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y curl wget unzip
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
-          && unzip protoc.zip \
-          && mv ./include/* /usr/include/ \
-          && mv ./bin/protoc /usr/bin/protoc
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-          && chmod +x protoc-gen-openapiv2 \
-          && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
+    && unzip protoc.zip \
+    && mv ./include/* /usr/include/ \
+    && mv ./bin/protoc /usr/bin/protoc
+
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 
 FROM chef AS plan
 COPY . .

diff --git a/user-ops-indexer/Dockerfile b/user-ops-indexer/Dockerfile
@@ -1,15 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y curl wget unzip
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
-          && unzip protoc.zip \
-          && mv ./include/* /usr/include/ \
-          && mv ./bin/protoc /usr/bin/protoc
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-          && chmod +x protoc-gen-openapiv2 \
-          && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
+    && unzip protoc.zip \
+    && mv ./include/* /usr/include/ \
+    && mv ./bin/protoc /usr/bin/protoc
+
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 
 FROM chef AS plan
 COPY . .

diff --git a/visualizer/Dockerfile b/visualizer/Dockerfile
@@ -1,17 +1,22 @@
-FROM lukemathwalker/cargo-chef:0.1.62-rust-1.72-buster as chef
-RUN apt-get update && apt-get install -y curl wget unzip
-WORKDIR /app
+FROM lukemathwalker/cargo-chef:0.1.62-rust-1.74-buster as chef
 
-# Install protoc
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip -O ./protoc.zip \
+WORKDIR /app
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "arm64") TARGETARCH=aarch_64 ;; \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-$TARGETARCH.zip -O ./protoc.zip \
     && unzip protoc.zip \
     && mv ./include/* /usr/include/ \
     && mv ./bin/protoc /usr/bin/protoc
 
-# Install protoc-gen-openapiv2
-RUN wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-x86_64 -O ./protoc-gen-openapiv2 \
-        && chmod +x protoc-gen-openapiv2 \
-        && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
+RUN case ${TARGETARCH} in \
+        "amd64") TARGETARCH=x86_64 ;; \
+    esac \
+    && wget https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.15.0/protoc-gen-openapiv2-v2.15.0-linux-$TARGETARCH -O ./protoc-gen-openapiv2 \
+    && chmod +x protoc-gen-openapiv2 \
+    && mv ./protoc-gen-openapiv2 /usr/bin/protoc-gen-openapiv2
 
 
 FROM chef AS plan