Skip to content

Commit ed7b941

Browse files
bourgeoisorbourgeoisor
committed
Revert "Add support for arm64 (#2589)"
This reverts commit 916eeac.
1 parent 0cd036e commit ed7b941

File tree

13 files changed

+27
-51
lines changed

13 files changed

+27
-51
lines changed

‎skaffold.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ kind: Config
1717
metadata:
1818
name: app
1919
build:
20-
platforms: ["linux/amd64", "linux/arm64"]
2120
artifacts:
2221
# image tags are relative; to specify an image repo (e.g. GCR), you
2322
# must provide a "default repo" using one of the methods described
@@ -50,8 +49,7 @@ build:
5049
tagPolicy:
5150
gitCommit: {}
5251
local:
53-
useDockerCLI: true
54-
useBuildkit: true
52+
useBuildkit: false
5553
manifests:
5654
kustomize:
5755
paths:

‎src/adservice/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM eclipse-temurin:21.0.5_11-jdk@sha256:a20cfa6afdbf57ff2c4de77ae2d0e3725a6349f1936b5ad7c3d1b06f6d1b840a AS builder
15+
FROM eclipse-temurin:21@sha256:b5fc642f67dbbd1c4ce811388801cb8480aaca8aa9e56fd6dcda362cfea113f1 AS builder
1616

1717
WORKDIR /app
1818

@@ -25,7 +25,7 @@ COPY . .
2525
RUN chmod +x gradlew
2626
RUN ./gradlew installDist
2727

28-
FROM eclipse-temurin:21.0.5_11-jre-alpine@sha256:4300bfe1e11f3dfc3e3512f39939f9093cf18d0e581d1ab1ccd0512f32fe33f0
28+
FROM eclipse-temurin:21.0.4_7-jre-alpine@sha256:8cc1202a100e72f6e91bf05ab274b373a5def789ab6d9e3e293a61236662ac27
2929

3030
# @TODO: https://github.com/GoogleCloudPlatform/microservices-demo/issues/2517
3131
# Download Stackdriver Profiler Java agent

‎src/cartservice/src/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@
1313
# limitations under the License.
1414

1515
# https://mcr.microsoft.com/product/dotnet/sdk
16-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.101-noble@sha256:1f13e67d295e02abdfd187c341f887442bad611eda536766172ced401fc8b9fa AS builder
17-
ARG TARGETARCH
16+
FROM mcr.microsoft.com/dotnet/sdk:9.0.100-noble@sha256:bd0365368f46274500ebb086f491703052b8ce23e3d52d3233a23b2020730057 AS builder
1817
WORKDIR /app
1918
COPY cartservice.csproj .
2019
RUN dotnet restore cartservice.csproj \
21-
-a $TARGETARCH
20+
-r linux-x64
2221
COPY . .
2322
RUN dotnet publish cartservice.csproj \
2423
-p:PublishSingleFile=true \
25-
-a $TARGETARCH \
24+
-r linux-x64 \
2625
--self-contained true \
2726
-p:PublishTrimmed=true \
2827
-p:TrimMode=full \
2928
-c release \
3029
-o /cartservice
3130

3231
# https://mcr.microsoft.com/product/dotnet/runtime-deps
33-
FROM mcr.microsoft.com/dotnet/runtime-deps:9.0.1-noble-chiseled@sha256:6f7466eda39e24efaf7eab2325e15d776a685d13cc93b4ea0cde9ee4f7982210
32+
FROM mcr.microsoft.com/dotnet/runtime-deps:9.0.0-noble-chiseled@sha256:5cc893809e2d2869e1a98c1eecc4c6ff6978d53bc3e5342014eff28a058867a4
3433

3534
WORKDIR /app
3635
COPY --from=builder /cartservice .

‎src/checkoutservice/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine@sha256:c23339199a08b0e12032856908589a6d41a0dab141b8b3b21f156fc571a3f1d3 AS builder
16-
ARG TARGETOS
17-
ARG TARGETARCH
15+
FROM golang:1.23.2-alpine@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 AS builder
1816
WORKDIR /src
1917

2018
# restore dependencies
@@ -25,7 +23,7 @@ COPY . .
2523

2624
# Skaffold passes in debug-oriented compiler flags
2725
ARG SKAFFOLD_GO_GCFLAGS
28-
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /checkoutservice .
26+
RUN CGO_ENABLED=0 GOOS=linux go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /checkoutservice .
2927

3028
FROM scratch
3129

‎src/currencyservice/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM node:20.18.1-alpine@sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 AS builder
15+
FROM node:20.17.0-alpine@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 AS builder
1616

1717
# Some packages (e.g. @google-cloud/profiler) require additional
1818
# deps for post-install scripts

‎src/emailservice/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM python:3.12.8-alpine@sha256:54bec49592c8455de8d5983d984efff76b6417a6af9b5dcc8d0237bf6ad3bd20 AS base
15+
FROM python:3.12.7-alpine@sha256:b83d5ec7274bee17d2f4bd0bfbb082f156241e4513f0a37c70500e1763b1d90d AS base
1616

1717
FROM base AS builder
1818

1919
RUN apk update \
20-
&& apk add --no-cache g++ linux-headers \
20+
&& apk add --no-cache wget g++ \
2121
&& rm -rf /var/cache/apk/*
2222

2323
# get packages
@@ -30,10 +30,6 @@ ENV PYTHONUNBUFFERED=1
3030
# Enable Profiler
3131
ENV ENABLE_PROFILER=1
3232

33-
RUN apk update \
34-
&& apk add --no-cache libstdc++ \
35-
&& rm -rf /var/cache/apk/*
36-
3733
WORKDIR /email_server
3834

3935
# Grab packages from builder

‎src/frontend/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine@sha256:c23339199a08b0e12032856908589a6d41a0dab141b8b3b21f156fc571a3f1d3 AS builder
16-
ARG TARGETOS
17-
ARG TARGETARCH
15+
FROM golang:1.23.2-alpine@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 AS builder
1816
WORKDIR /src
1917

2018
# restore dependencies
@@ -24,7 +22,7 @@ COPY . .
2422

2523
# Skaffold passes in debug-oriented compiler flags
2624
ARG SKAFFOLD_GO_GCFLAGS
27-
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /go/bin/frontend .
25+
RUN CGO_ENABLED=0 GOOS=linux go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /go/bin/frontend .
2826

2927
FROM scratch
3028
WORKDIR /src

‎src/loadgenerator/Dockerfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,16 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM python:3.12.8-alpine@sha256:54bec49592c8455de8d5983d984efff76b6417a6af9b5dcc8d0237bf6ad3bd20 AS base
15+
FROM python:3.12.6-slim@sha256:ad48727987b259854d52241fac3bc633574364867b8e20aec305e6e7f4028b26 AS base
1616

1717
FROM base AS builder
1818

19-
RUN apk update \
20-
&& apk add --no-cache wget g++ linux-headers \
21-
&& rm -rf /var/cache/apk/*
22-
2319
COPY requirements.txt .
2420

2521
RUN pip install --prefix="/install" -r requirements.txt
2622

2723
FROM base
2824

29-
RUN apk update \
30-
&& apk add --no-cache libstdc++ \
31-
&& rm -rf /var/cache/apk/*
32-
3325
WORKDIR /loadgen
3426

3527
COPY --from=builder /install /usr/local

‎src/paymentservice/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM node:20.18.1-alpine@sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 AS builder
15+
FROM node:20.17.0-alpine@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 AS builder
1616

1717
# Some packages (e.g. @google-cloud/profiler) require additional
1818
# deps for post-install scripts

‎src/productcatalogservice/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine@sha256:c23339199a08b0e12032856908589a6d41a0dab141b8b3b21f156fc571a3f1d3 AS builder
16-
ARG TARGETOS
17-
ARG TARGETARCH
15+
FROM golang:1.23.2-alpine@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 AS builder
1816

1917
WORKDIR /src
2018
# restore dependencies
@@ -24,7 +22,7 @@ COPY . .
2422

2523
# Skaffold passes in debug-oriented compiler flags
2624
ARG SKAFFOLD_GO_GCFLAGS
27-
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /productcatalogservice .
25+
RUN CGO_ENABLED=0 GOOS=linux go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /productcatalogservice .
2826

2927
FROM scratch
3028

‎src/recommendationservice/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM python:3.12.8-alpine@sha256:54bec49592c8455de8d5983d984efff76b6417a6af9b5dcc8d0237bf6ad3bd20 AS base
15+
FROM python:3.12.8-alpine@sha256:f92e36f6569658ba9501e2e1e3ca780d61faea8e84edd990a0ed70d0ca8add4a AS base
1616

1717
FROM base AS builder
1818

1919
RUN apk update \
20-
&& apk add --no-cache g++ linux-headers \
20+
&& apk add --no-cache \
21+
wget \
22+
g++ \
2123
&& rm -rf /var/cache/apk/*
2224

2325
# get packages
@@ -28,10 +30,6 @@ FROM base
2830
# Enable unbuffered logging
2931
ENV PYTHONUNBUFFERED=1
3032

31-
RUN apk update \
32-
&& apk add --no-cache libstdc++ \
33-
&& rm -rf /var/cache/apk/*
34-
3533
# get packages
3634
WORKDIR /recommendationservice
3735

‎src/shippingservice/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine@sha256:c23339199a08b0e12032856908589a6d41a0dab141b8b3b21f156fc571a3f1d3 AS builder
16-
ARG TARGETOS
17-
ARG TARGETARCH
15+
FROM golang:1.23.2-alpine@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 AS builder
1816
WORKDIR /src
1917

2018
# restore dependencies
@@ -24,7 +22,7 @@ COPY . .
2422

2523
# Skaffold passes in debug-oriented compiler flags
2624
ARG SKAFFOLD_GO_GCFLAGS
27-
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /go/bin/shippingservice .
25+
RUN CGO_ENABLED=0 GOOS=linux go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -o /go/bin/shippingservice .
2826

2927
FROM scratch
3028

‎src/shoppingassistantservice/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM python:3.12.8-slim@sha256:123be5684f39d8476e64f47a5fddf38f5e9d839baff5c023c815ae5bdfae0df7 AS base
15+
FROM python:3.12.6-slim@sha256:ad48727987b259854d52241fac3bc633574364867b8e20aec305e6e7f4028b26 AS base
1616

1717
FROM base AS builder
1818

1919
RUN apt-get -qq update \
20-
&& apt-get install -y --no-install-recommends g++ \
20+
&& apt-get install -y --no-install-recommends \
21+
wget g++ \
2122
&& rm -rf /var/lib/apt/lists/*
2223

2324
# get packages

0 commit comments

Comments
 (0)