spec

Signed-off-by: myan <myan@redhat.com>

Author: yanmxa

agent/Containerfile.operator

@@ -10,7 +10,7 @@ COPY go.mod go.sum ./
 COPY ./agent/ ./agent/
 COPY ./pkg/ ./pkg/
 
-RUN CGO_ENABLED=1 GOFLAGS="-p=4" go build -tags strictfipsruntime -a -v -o bin/agent ./agent/cmd/agent/main.go
+RUN CGO_ENABLED=1 GOFLAGS="-p=4" go build -tags strictfipsruntime -a -v -o bin/agent ./agent/cmd/main.go
 
 # Stage 2: Copy the binaries from the image builder to the base image
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
@@ -29,22 +29,22 @@ ARG IMAGE_SUMMARY
 ARG IMAGE_OPENSHIFT_TAGS
 
 LABEL org.label-schema.vendor="Red Hat" \
-    org.label-schema.name="$IMAGE_NAME_ARCH" \
-    org.label-schema.description="$IMAGE_DESCRIPTION" \
-    org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url=$VCS_URL \
-    org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA" \
-    org.label-schema.schema-version="1.0" \
-    name="$IMAGE_NAME" \
-    maintainer="$IMAGE_MAINTAINER" \
-    vendor="$IMAGE_VENDOR" \
-    version="$IMAGE_VERSION" \
-    release="$IMAGE_RELEASE" \
-    description="$IMAGE_DESCRIPTION" \
-    summary="$IMAGE_SUMMARY" \
-    io.k8s.display-name="$IMAGE_DISPLAY_NAME" \
-    io.k8s.description="$IMAGE_DESCRIPTION" \
-    io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"
+  org.label-schema.name="$IMAGE_NAME_ARCH" \
+  org.label-schema.description="$IMAGE_DESCRIPTION" \
+  org.label-schema.vcs-ref=$VCS_REF \
+  org.label-schema.vcs-url=$VCS_URL \
+  org.label-schema.license="Red Hat Advanced Cluster Management for Kubernetes EULA" \
+  org.label-schema.schema-version="1.0" \
+  name="$IMAGE_NAME" \
+  maintainer="$IMAGE_MAINTAINER" \
+  vendor="$IMAGE_VENDOR" \
+  version="$IMAGE_VERSION" \
+  release="$IMAGE_RELEASE" \
+  description="$IMAGE_DESCRIPTION" \
+  summary="$IMAGE_SUMMARY" \
+  io.k8s.display-name="$IMAGE_DISPLAY_NAME" \
+  io.k8s.description="$IMAGE_DESCRIPTION" \
+  io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"
 
 ENV USER_UID=1001
 ENV USER_NAME=agent
@@ -53,10 +53,10 @@ ENV USER_NAME=agent
 COPY --from=builder /workspace/bin/agent /usr/local/bin/agent
 
 COPY ./agent/scripts/user_setup /usr/local/scripts/user_setup
-RUN  /usr/local/scripts/user_setup
+RUN /usr/local/scripts/user_setup
 
-RUN microdnf update -y && \
-    microdnf clean all
+RUN microdnf update -y &&
+  microdnf clean all
 
 USER ${USER_UID}
-ENTRYPOINT ["/usr/local/bin/agent"]
+ENTRYPOINT ["/usr/local/bin/agent"]

agent/Dockerfile

@@ -9,7 +9,7 @@ COPY go.mod go.sum ./
 COPY ./agent/ ./agent/
 COPY ./pkg/ ./pkg/
 
-RUN go build -o bin/agent ./agent/cmd/agent/main.go
+RUN go build -o bin/agent ./agent/cmd/main.go
 
 # Stage 2: Copy the binaries from the image builder to the base image
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
@@ -20,10 +20,10 @@ ENV USER_NAME=agent
 COPY --from=builder /workspace/bin/agent /usr/local/bin/agent
 
 COPY ./agent/scripts/user_setup /usr/local/scripts/user_setup
-RUN  /usr/local/scripts/user_setup
+RUN /usr/local/scripts/user_setup
 
-RUN microdnf update -y && \
-    microdnf clean all
+RUN microdnf update -y &&
+  microdnf clean all
 
 USER ${USER_UID}
 ENTRYPOINT ["/usr/local/bin/agent"]