stupid e itwas arm and not amd
This commit is contained in:
parent
73515cdf24
commit
d176e24bb8
|
@ -486,22 +486,25 @@ docker:
|
||||||
--no-cache
|
--no-cache
|
||||||
--push
|
--push
|
||||||
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "funkwhale"
|
- if: $CI_COMMIT_BRANCH =~ /(stable|develop)/
|
||||||
# We don't provide priviledged runners to everyone, so we can only build docker images in the funkwhale group
|
|
||||||
variables:
|
|
||||||
BUILD_ARGS: >
|
|
||||||
--set *.platform=linux/amd64
|
|
||||||
--set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME,oci-mediatypes=false
|
|
||||||
|
|
||||||
image: $CI_REGISTRY/funkwhale/ci/docker:20
|
|
||||||
services:
|
|
||||||
- docker:20-dind
|
|
||||||
variables:
|
variables:
|
||||||
BUILD_ARGS: >
|
BUILD_ARGS: >
|
||||||
--set *.platform=linux/amd64,linux/arm64,linux/arm/v7
|
--set *.platform=linux/amd64,linux/arm64,linux/arm/v7
|
||||||
--set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,oci-mediatypes=false
|
--set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,oci-mediatypes=false
|
||||||
--set *.cache-to=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,mode=max,oci-mediatypes=false
|
--set *.cache-to=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,mode=max,oci-mediatypes=false
|
||||||
--push
|
--push
|
||||||
|
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "funkwhale"
|
||||||
|
# We don't provide priviledged runners to everyone, so we can only build docker images in the funkwhale group
|
||||||
|
variables:
|
||||||
|
BUILD_ARGS: >
|
||||||
|
--set *.platform=linux/amd64,linux/arm64,linux/arm/v7
|
||||||
|
--set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME,oci-mediatypes=false
|
||||||
|
|
||||||
|
image: $CI_REGISTRY/funkwhale/ci/docker:20
|
||||||
|
services:
|
||||||
|
- docker:20-dind
|
||||||
|
variables:
|
||||||
<<: *keep_git_files_permissions
|
<<: *keep_git_files_permissions
|
||||||
DOCKER_HOST: tcp://docker:2375/
|
DOCKER_HOST: tcp://docker:2375/
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
|
|
Loading…
Reference in New Issue