From db79e18821d4e86e85fb4d06137972adef8cb18c Mon Sep 17 00:00:00 2001 From: Xbird Date: Sat, 24 Sep 2022 17:51:11 +0000 Subject: [PATCH] Work on docker optimisation --- .gitlab-ci.yml | 15 ++++++++++++++- visionversion.json | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14e6f89..664a749 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,14 +63,27 @@ publish: registry_img: '' before_script: - apk add jq + - mkdir -p .docker + - "docker load -q -i .docker/fs.tar 2>&1 || :" + - rm -rf .docker script: - APP_VERSION=$(cat visionversion.json | jq .version -r) - docker login $registry_host -u $registry_user -p $registry_pass - docker build -f ./Dockerfile -t $registry_host/$registry_img:$APP_VERSION . + - docker build --cache-from=$registry_host/$registry_img -t $registry_host/$registry_img . - docker push $registry_host/$registry_img:$APP_VERSION - docker logout $registry_host - docker login -u $docker_user -p $docker_pass - docker tag $registry_host/$registry_img:$APP_VERSION $docker_host/$docker_img:$APP_VERSION - docker tag $registry_host/$registry_img:$APP_VERSION $docker_host/$docker_img - docker push $docker_host/$docker_img:$APP_VERSION - - docker push $docker_host/$docker_img \ No newline at end of file + - docker push $docker_host/$docker_img + after_script: + - mkdir -p .docker + - "docker save -o .docker/fs.tar $docker_host/$docker_img 2>&1 || :" + - docker system prune -a + cache: + - key: $CI_COMMIT_REF_SLUG + paths: + - .docker + when: on_success \ No newline at end of file diff --git a/visionversion.json b/visionversion.json index 4f8c0f3..40164e2 100644 --- a/visionversion.json +++ b/visionversion.json @@ -1,3 +1,3 @@ { - "version": "0.2.12" + "version": "0.2.13" }