[Misc]revert ome-agent dockerfile (#323)

Author: pallasathena92

dockerfiles/ome-agent.Dockerfile

@@ -1,9 +1,3 @@
-# Configurable base image - must be declared before any FROM statement
-# Defaults to Oracle Linux 10 for OCI SDK compatibility
-# Can be overridden with --build-arg BASE_IMAGE=ubuntu:24.04
-# Note: Ubuntu 22.04 has glibc 2.35, but golang:1.24 requires glibc 2.38+
-ARG BASE_IMAGE=oraclelinux:10-slim
-
 # Build the ome-agent binary
 FROM golang:1.24 AS builder
 
@@ -29,75 +23,39 @@ WORKDIR /workspace
 COPY go.mod go.mod
 COPY go.sum go.sum
 
-# Download dependencies with Go module cache
-RUN --mount=type=cache,target=/go/pkg/mod \
-    go mod download
-
-# Copy XET dependencies from other pkg subdirectories
-COPY pkg/configutils/ pkg/configutils/
-COPY pkg/logging/ pkg/logging/
-
-# Copy XET package for building with better caching
-COPY pkg/xet/ pkg/xet/
-
-# Download Rust dependencies with cargo cache
-RUN --mount=type=cache,target=/root/.cargo/registry \
-    --mount=type=cache,target=/root/.cargo/git \
-    cd pkg/xet && cargo fetch
+# Download dependencies
+RUN go mod download
 
-# Build the XET library with cargo build cache
-RUN --mount=type=cache,target=/root/.cargo/registry \
-    --mount=type=cache,target=/root/.cargo/git \
-    cd pkg/xet && \
-    cargo build --release
-
-# Verify static library exists and remove dynamic library to force static linking
-RUN ls -lh /workspace/pkg/xet/target/release/libxet.* && \
-    rm -f /workspace/pkg/xet/target/release/libxet.so
-
-# Copy remaining source code
+# Copy source code
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 COPY internal/ internal/
 
+# Build the XET library first
+RUN cd pkg/xet && make build
+
 # Build arguments for version info
 ARG VERSION
 ARG GIT_TAG
 ARG GIT_COMMIT
 
 # Build the ome-agent binary (CGO must be enabled for XET library)
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    PKG_CONFIG_ALL_STATIC=1 \
-    CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
+RUN CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
     go build -a \
     -ldflags "-X github.com/sgl-project/ome/pkg/version.GitVersion=${GIT_TAG} -X github.com/sgl-project/ome/pkg/version.GitCommit=${GIT_COMMIT}" \
     -o ome-agent ./cmd/ome-agent
 
-# Use the base image specified at the top of the file
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
-# Install/update packages and runtime dependencies based on the base image
-RUN if [ -f /usr/bin/microdnf ]; then \
-        microdnf update -y && \
-        microdnf install -y \
-            glibc \
-            libgcc \
-            libstdc++ \
-            openssl-libs && \
-        microdnf clean all; \
-    elif [ -f /usr/bin/apt-get ]; then \
-        apt-get update && \
-        apt-get install -y \
-            ca-certificates \
-            libc6 \
-            libgcc-s1 \
-            libstdc++6 \
-            libssl3 && \
-        apt-get upgrade -y && \
-        apt-get clean && rm -rf /var/lib/apt/lists/*; \
-    fi
+# Use Oracle Linux 10 as base image for OCI SDK compatibility
+FROM oraclelinux:10-slim
+RUN microdnf update -y && microdnf clean all
+
+# Install runtime dependencies for the XET library
+RUN microdnf install -y \
+    glibc \
+    libgcc \
+    libstdc++ \
+    openssl-libs \
+    && microdnf clean all
 
 COPY --from=builder /workspace/ome-agent /
 COPY config/ome-agent/ome-agent.yaml /