Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds image cache images to build #2919

Merged
merged 5 commits into from
Nov 25, 2021
Merged

Adds image cache images to build #2919

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e875f1d
Adds image cache images to build
bomoko Nov 8, 2021
5df2719
Removes test line
bomoko Nov 8, 2021
04ff878
Merge branch 'main' into feature/image_cache_details
bomoko Nov 23, 2021
6b61f3c
Adds service label selector
bomoko Nov 23, 2021
bcd8441
Adds yq4 and renames all yq 3 instances to yq3
bomoko Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions images/kubectl-build-deploy-dind/build-deploy-docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,15 @@ patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NA
previousStepEnd=${currentStepEnd}
set -x

##############################################
### CACHE IMAGE LIST GENERATION
##############################################

LAGOON_CACHE_BUILD_ARGS=()
readarray LAGOON_CACHE_BUILD_ARGS < <(kubectl --insecure-skip-tls-verify -n ${NAMESPACE} get deployments -o yaml -l 'lagoon.sh/service' | yq e '.items[].spec.template.spec.containers[].image | capture("^(?P<image>.+\/.+\/.+\/(?P<name>.+)\@.*)$") | "LAGOON_CACHE_" + .name + "=\"" + .image + "\""' -)
tobybellwood marked this conversation as resolved.
Show resolved Hide resolved



##############################################
### BUILD IMAGES
##############################################
Expand Down Expand Up @@ -514,6 +523,12 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
BUILD_ARGS+=(--build-arg LAGOON_BUILD_TYPE="${BUILD_TYPE}")
BUILD_ARGS+=(--build-arg LAGOON_GIT_SOURCE_REPOSITORY="${SOURCE_REPOSITORY}")

# Add in the cache args
for value in "${LAGOON_CACHE_BUILD_ARGS[@]}"
do
BUILD_ARGS+=(--build-arg $value)
done

set +x
BUILD_ARGS+=(--build-arg LAGOON_SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY}")
set -x
Expand Down