Skip to content
Snippets Groups Projects
Commit e53a4b95 authored by Griefed's avatar Griefed :joystick:
Browse files

ci: Remove from.cache in docker test job. Refactor build to use cache from develop tag.

parent 264018b7
No related branches found
No related tags found
No related merge requests found
...@@ -18,11 +18,9 @@ test docker: ...@@ -18,11 +18,9 @@ test docker:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- docker buildx create --use --name grfdbuilder - docker buildx create --use --name grfdbuilder
script: script:
- docker pull "$CI_REGISTRY_IMAGE:develop"
- docker buildx build - docker buildx build
--push --push
--platform linux/amd64,linux/arm/v7,linux/arm64 --platform linux/amd64,linux/arm/v7,linux/arm64
--cache-from "$CI_REGISTRY_IMAGE:develop"
--tag "$CI_REGISTRY_IMAGE:develop" --tag "$CI_REGISTRY_IMAGE:develop"
--tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" . --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" .
except: except:
...@@ -66,11 +64,11 @@ build: ...@@ -66,11 +64,11 @@ build:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- docker buildx create --use --name grfdbuilder - docker buildx create --use --name grfdbuilder
script: script:
- docker pull "$CI_REGISTRY_IMAGE:latest" - docker pull "$CI_REGISTRY_IMAGE:develop"
- docker buildx build - docker buildx build
--push --push
--platform linux/amd64,linux/arm/v7,linux/arm64 --platform linux/amd64,linux/arm/v7,linux/arm64
--cache-from "$CI_REGISTRY_IMAGE:latest" --cache-from "$CI_REGISTRY_IMAGE:develop"
--tag "$CI_REGISTRY_IMAGE:latest" --tag "$CI_REGISTRY_IMAGE:latest"
--tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
--tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" . --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment