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

use default builder for docker compose tests #858

Merged
merged 2 commits into from
Oct 26, 2023
Merged

use default builder for docker compose tests #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
097888f
ensure to use default builder
tobybellwood Oct 25, 2023
5063b7f
use default builder
tobybellwood Oct 26, 2023
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
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ node ('lagoon-images') {
'Run all the tests on the local images': {
stage ('running test suite') {
dir ('tests') {
sh script: "docker buildx use default", label: "Ensure to use default builder"
sh script: "grep -rl uselagoon . | xargs sed -i '/^FROM/ s/uselagoon/${CI_BUILD_TAG}/'"
sh script: "grep -rl uselagoon . | xargs sed -i '/image: uselagoon/ s/uselagoon/${CI_BUILD_TAG}/'"
sh script: "find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d'"
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ docker_build_local = DOCKER_BUILDKIT=1 docker build $(DOCKER_BUILD_PARAMS) \
-f $(2) $(3)

docker_buildx_two = docker buildx build $(DOCKER_BUILD_PARAMS) \
--builder ci-local \
--platform linux/amd64,linux/arm64/v8 \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg LAGOON_VERSION=$(LAGOON_VERSION) \
Expand All @@ -91,6 +92,7 @@ docker_buildx_two = docker buildx build $(DOCKER_BUILD_PARAMS) \
-f $(2) $(3)

docker_buildx_three = docker buildx build $(DOCKER_BUILD_PARAMS) \
--builder ci-local \
--platform linux/amd64,linux/arm64/v8 \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg LAGOON_VERSION=$(LAGOON_VERSION) \
Expand Down Expand Up @@ -354,7 +356,7 @@ scan-images:
.PHONY: docker-buildx-configure
docker-buildx-configure:
docker run -d -p 5000:5000 --restart always --name registry registry:2
docker buildx create --platform linux/arm64,linux/arm/v8 --driver-opt network=host --name ci-local --use
docker buildx create --platform linux/arm64,linux/arm/v8 --driver-opt network=host --name ci-local
docker buildx ls
docker context ls

Expand Down