From 6ad1b23359a689ec3bcf7f6a514b00421a080f3f Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Fri, 21 Feb 2025 14:27:24 +0300 Subject: [PATCH] Some changes in dockerfile and jenkinsfile --- Dockerfile | 3 ++- Jenkinsfile | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d634c6..4ddd137 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ RUN apt update && apt install -y musl-tools RUN rustup target add x86_64-unknown-linux-musl COPY . . +RUN cargo test RUN cargo build --release --target=x86_64-unknown-linux-musl FROM alpine:latest @@ -14,4 +15,4 @@ COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/exporter /app/ RUN apk add --no-cache ca-certificates -CMD ["/app/exporter"] +ENTRYPOINT ["/app/exporter"] diff --git a/Jenkinsfile b/Jenkinsfile index 0a17d6b..19c0ce6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,10 +23,8 @@ pipeline { } steps { script { - def image = docker.build("${env.IMAGE_NAME}:${env.IMAGE_TAG}") - try { - sh "docker run --rm ${env.IMAGE_NAME}:${env.IMAGE_TAG} cargo test" + def image = docker.build("${env.IMAGE_NAME}:${env.IMAGE_TAG}") sh "docker tag ${env.IMAGE_NAME}:${env.IMAGE_TAG} ${env.REGISTRY_NAME}/${env.IMAGE_NAME}:${env.IMAGE_TAG}" } catch (Exception e) { error("Tests failed: ${e.message}")