chore: upgrade 1.2.1-i

Author: naviat

Dockerfile

@@ -1,27 +1,18 @@
 # Build stage
-FROM golang:1.24 AS builder
+FROM golang:1.22 AS builder
 
 # Set necessary environment variables
 ENV CGO_ENABLED=1
 ENV GOOS=linux
 ENV GOARCH=amd64
-ARG SONIC_VERSION=v2.0.6
 
 WORKDIR /tmp
 
-RUN set -eux; \
-    apt-get update && \
-    apt-get install -y \
-        ca-certificates \
-        curl \
-        wget \
-        git \
-        build-essential \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends make gcc g++ musl-dev git && rm -rf /var/lib/apt/lists/*
 
-RUN git clone --depth 1 --branch ${SONIC_VERSION} https://github.com/0xsoniclabs/sonic.git && \
-    cd sonic && \
-    make
+RUN git clone --depth 1 --branch v1.2.1-i https://github.com/Fantom-foundation/Sonic.git && \
+    cd Sonic && \
+    make all
 
 # Final stage
 
@@ -33,9 +24,9 @@ WORKDIR /root/.sonic
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl jq && rm -rf /var/lib/apt/lists/*
 
 # Copy binaries from builder stage
-COPY --from=builder /tmp/sonic/build/ /usr/local/bin
+COPY --from=builder /tmp/Sonic/build/ /usr/local/bin
 
 # Expose Sonic's default ports (change if necessary)
-EXPOSE 18545/tcp 18546/tcp 5050/tcp 5050/udp
+EXPOSE 18545 18546
 
-ENTRYPOINT ["sonicd"]
+ENTRYPOINT ["sonicd"]

Dockerfile.v2Sonic

@@ -0,0 +1,41 @@
+# Build stage
+FROM golang:1.24 AS builder
+
+# Set necessary environment variables
+ENV CGO_ENABLED=1
+ENV GOOS=linux
+ENV GOARCH=amd64
+ARG SONIC_VERSION=v2.0.6
+
+WORKDIR /tmp
+
+RUN set -eux; \
+    apt-get update && \
+    apt-get install -y \
+        ca-certificates \
+        curl \
+        wget \
+        git \
+        build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN git clone --depth 1 --branch ${SONIC_VERSION} https://github.com/0xsoniclabs/sonic.git && \
+    cd sonic && \
+    make
+
+# Final stage
+
+FROM ubuntu:22.04
+
+WORKDIR /root/.sonic
+
+# Install runtime dependencies, including glibc
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl jq && rm -rf /var/lib/apt/lists/*
+
+# Copy binaries from builder stage
+COPY --from=builder /tmp/sonic/build/ /usr/local/bin
+
+# Expose Sonic's default ports (change if necessary)
+EXPOSE 18545/tcp 18546/tcp 5050/tcp 5050/udp
+
+ENTRYPOINT ["sonicd"]