From 0b0016d54808215316be80bb66f3995c39c1f89e Mon Sep 17 00:00:00 2001 From: ChandonPierre Date: Fri, 19 Jan 2024 13:59:37 -0500 Subject: [PATCH] fix(ci): debug build --- .gitlab-ci.yml | 8 ++------ Dockerfile | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9f0b8f..e81b836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,6 @@ build-standard: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json script: |- /kaniko/executor \ - $KANIKO_ADDTL_ARGS \ --context ${CI_PROJECT_DIR} \ --build-arg DEBUG_IMAGE=${DEBUG_IMAGE} \ --dockerfile $DOCKERFILE \ @@ -60,7 +59,6 @@ build-debug: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json script: |- /kaniko/executor \ - $KANIKO_ADDTL_ARGS \ --context ${CI_PROJECT_DIR} \ --build-arg DEBUG_IMAGE=${DEBUG_IMAGE} \ --dockerfile $DOCKERFILE \ @@ -110,8 +108,7 @@ release-standard: - export RELEASE_IMAGE=$CI_REGISTRY_IMAGE:$BUILD_VERSION script: |- /kaniko/executor \ - $KANIKO_ADDTL_ARGS \ - --context . \ + --context ${CI_PROJECT_DIR} \ --dockerfile $DOCKERFILE \ --build-arg DEBUG_IMAGE=${DEBUG_IMAGE} \ --destination $RELEASE_IMAGE \ @@ -139,8 +136,7 @@ release-debug: - export RELEASE_IMAGE=$CI_REGISTRY_IMAGE:$BUILD_VERSION-debug script: |- /kaniko/executor \ - $KANIKO_ADDTL_ARGS \ - --context . \ + --context ${CI_PROJECT_DIR} \ --dockerfile $DOCKERFILE \ --build-arg DEBUG_IMAGE=${DEBUG_IMAGE} \ --destination $RELEASE_IMAGE \ diff --git a/Dockerfile b/Dockerfile index 2ae5513..dba5e8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apk upgrade --no-cache --update RUN apk add --no-cache --update tzdata pcre zlib libssl3 # If set to 1, enables building debug version of nginx, which is super-useful, but also heavy to build. +ARG DEBUG_IMAGE ARG DO_DEBUG_BUILD="${DEBUG_IMAGE:-"0"}" ENV NGINX_VERSION 1.25.3