From 97fde10d112507aeca763b9e687a429767c4d8bb Mon Sep 17 00:00:00 2001 From: Dan Manor Date: Tue, 13 Aug 2024 17:52:28 +0300 Subject: [PATCH] NO-ISSUE: Change debug Dockerfile so it will not require prior actions (#6674) --- Dockerfile.assisted-service-debug | 17 +++++++++++++---- Makefile | 5 +---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Dockerfile.assisted-service-debug b/Dockerfile.assisted-service-debug index 822b64b8252e..451910c019f4 100644 --- a/Dockerfile.assisted-service-debug +++ b/Dockerfile.assisted-service-debug @@ -2,9 +2,9 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.20 AS golang RUN GOFLAGS=-mod=mod go install github.com/go-delve/delve/cmd/dlv@v1.9.1 -FROM quay.io/centos/centos:stream9 +FROM quay.io/centos/centos:stream9 AS builder -RUN dnf install --enablerepo=crb -y gcc git nmstate-devel openssl-devel && dnf clean all +RUN dnf install --enablerepo=crb -y gcc git nmstate-devel openssl-devel make && dnf clean all ENV GOROOT=/usr/lib/golang ENV GOPATH=/opt/app-root/src/go @@ -15,10 +15,19 @@ COPY --from=golang $GOROOT $GOROOT RUN chmod 775 -R $GOPATH && chmod 775 -R $GOROOT +RUN git config --global --add safe.directory /opt/app-root/src +COPY . ./assisted-service +RUN cd ./assisted-service && make build-minimal + +FROM quay.io/centos/centos:stream9 + +RUN dnf install --enablerepo=crb -y nmstate-devel + ARG DEBUG_SERVICE_PORT=40000 EXPOSE 8090 $DEBUG_SERVICE_PORT -COPY assisted-service /assisted-service -COPY assisted-service-operator /assisted-service-operator +COPY --from=builder /opt/app-root/src/go/bin/dlv /usr/bin/dlv +COPY --from=builder /assisted-service/build/assisted-installer/assisted-service /assisted-service +COPY --from=builder /assisted-service/build/assisted-installer/assisted-service-operator /assisted-service-operator CMD ["dlv", "--listen=:40000", "--headless=true", "--continue", "--api-version=2", "--accept-multiclient", "exec", "/assisted-service"] diff --git a/Makefile b/Makefile index a404584938f4..3098cb08a86b 100644 --- a/Makefile +++ b/Makefile @@ -228,10 +228,7 @@ update-minimal: $(CONTAINER_COMMAND) build $(CONTAINER_BUILD_PARAMS) -f Dockerfile.assisted-service . -t $(SERVICE) update-debug-minimal: - export DEBUG_SERVICE=True && $(MAKE) build-minimal - mkdir -p build/debug-image && cp Dockerfile.assisted-service-debug $(BUILD_FOLDER)/assisted-service $(BUILD_FOLDER)/assisted-service-operator build/debug-image - $(CONTAINER_COMMAND) build $(CONTAINER_BUILD_PARAMS) --build-arg SERVICE=$(SERVICE) --build-arg DEBUG_SERVICE_PORT=$(DEBUG_SERVICE_PORT) -f build/debug-image/Dockerfile.assisted-service-debug build/debug-image -t $(SERVICE) - rm -r build/debug-image + $(CONTAINER_COMMAND) build $(CONTAINER_BUILD_PARAMS) --build-arg DEBUG_SERVICE_PORT=$(DEBUG_SERVICE_PORT) -f Dockerfile.assisted-service-debug -t $(SERVICE) update-image: $(UPDATE_IMAGE)