Commit 59adbee0 authored by FulcrandG's avatar FulcrandG
Browse files

Testing docker and trivy jobs

parent 7de53b67

jobs/docker_build/docker_build.yml

+0 −7
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ docker_build: 
    COMMIT_CREATE_LATEST: "false"

    TAG_CREATE_LATEST: "true"

  script:



    - echo "CI_REGISTRY $CI_REGISTRY"

    - echo "CI_REGISTRY_IMAGE $CI_REGISTRY_IMAGE"



    - mkdir -p /kaniko/.docker/

    - if [ ! -z ${CUSTOM_REGISTRY} ]; then

    -   echo "{\"auths\":{\"$CUSTOM_REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
@@ -36,9 +32,6 @@ docker_build: 
    -   fi

    - fi



    - echo "REGISTRY_IMAGE $REGISTRY_IMAGE"

    - echo "OPTIONAL_TAG $OPTIONAL_TAG"



    - if [ ! -z ${CUSTOM_TAG} ]; then

    -   /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${CUSTOM_TAG}

    - else

jobs/trivy_image/trivy_image.yml

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ trivy: 


    - if [ ! -z ${CUSTOM_REGISTRY} ]; then

    -   docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD $CUSTOM_REGISTRY

    -   REGISTRY_IMAGE=$CUSTOM_REGISTRY/$CI_PROJECT_PATH

    -   REGISTRY_IMAGE=$CUSTOM_REGISTRY

    - else

    -   docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

    -   REGISTRY_IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH

    -   REGISTRY_IMAGE=$CI_REGISTRY_IMAGE

    - fi



    - if [ ! -z ${CUSTOM_TAG} ]; then