mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-29 18:22:37 +02:00
Save cache files to /tmp to avoid permission denied in machine job
This commit is contained in:
parent
9d5f8e55bd
commit
a61cab6d3c
1 changed files with 50 additions and 12 deletions
|
@ -30,14 +30,14 @@ aliases:
|
||||||
- &restore-cache
|
- &restore-cache
|
||||||
key: v1-{{ checksum "dangerzone-converter/Dockerfile" }}-{{ checksum "dangerzone-converter/dangerzone.py" }}-{{ checksum "dangerzone-converter/document-to-pixels" }}-{{ checksum "dangerzone-converter/pixels-to-pdf" }}
|
key: v1-{{ checksum "dangerzone-converter/Dockerfile" }}-{{ checksum "dangerzone-converter/dangerzone.py" }}-{{ checksum "dangerzone-converter/document-to-pixels" }}-{{ checksum "dangerzone-converter/pixels-to-pdf" }}
|
||||||
paths:
|
paths:
|
||||||
- /caches/dangerzone-converter.tar.gz
|
- /tmp/caches/dangerzone-converter.tar.gz
|
||||||
- /caches/image-id.txt
|
- /tmp/caches/image-id.txt
|
||||||
|
|
||||||
- ©-image
|
- ©-image
|
||||||
name: Copy container image into package
|
name: Copy container image into package
|
||||||
command: |
|
command: |
|
||||||
cp /caches/dangerzone-converter.tar.gz share/
|
cp /tmp/caches/dangerzone-converter.tar.gz share/
|
||||||
cp /caches/image-id.txt share/
|
cp /tmp/caches/image-id.txt share/
|
||||||
|
|
||||||
- &deploy-packagecloud
|
- &deploy-packagecloud
|
||||||
name: Deploy to packagecloud.io
|
name: Deploy to packagecloud.io
|
||||||
|
@ -76,7 +76,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Build Dangerzone image
|
name: Build Dangerzone image
|
||||||
command: |
|
command: |
|
||||||
if [ -f "/caches/dangerzone-converter.tar.gz" ]; then
|
if [ -f "/tmp/caches/dangerzone-converter.tar.gz" ]; then
|
||||||
echo "Already cached, skipping"
|
echo "Already cached, skipping"
|
||||||
else
|
else
|
||||||
docker build --cache-from=dangerzone.rocks/dangerzone --tag dangerzone.rocks/dangerzone dangerzone-converter
|
docker build --cache-from=dangerzone.rocks/dangerzone --tag dangerzone.rocks/dangerzone dangerzone-converter
|
||||||
|
@ -84,19 +84,19 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Save Dangerzone image and image-id.txt to cache
|
name: Save Dangerzone image and image-id.txt to cache
|
||||||
command: |
|
command: |
|
||||||
if [ -f "/caches/dangerzone-converter.tar.gz" ]; then
|
if [ -f "/tmp/caches/dangerzone-converter.tar.gz" ]; then
|
||||||
echo "Already cached, skipping"
|
echo "Already cached, skipping"
|
||||||
else
|
else
|
||||||
mkdir -p /caches
|
mkdir -p /tmp/caches
|
||||||
docker save -o /caches/dangerzone-converter.tar dangerzone.rocks/dangerzone
|
docker save -o /tmp/caches/dangerzone-converter.tar dangerzone.rocks/dangerzone
|
||||||
gzip -f /caches/dangerzone-converter.tar
|
gzip -f /tmp/caches/dangerzone-converter.tar
|
||||||
docker image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > /caches/image-id.txt
|
docker image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > /tmp/caches/image-id.txt
|
||||||
fi
|
fi
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: v1-{{ checksum "dangerzone-converter/Dockerfile" }}-{{ checksum "dangerzone-converter/dangerzone.py" }}-{{ checksum "dangerzone-converter/document-to-pixels" }}-{{ checksum "dangerzone-converter/pixels-to-pdf" }}
|
key: v1-{{ checksum "dangerzone-converter/Dockerfile" }}-{{ checksum "dangerzone-converter/dangerzone.py" }}-{{ checksum "dangerzone-converter/document-to-pixels" }}-{{ checksum "dangerzone-converter/pixels-to-pdf" }}
|
||||||
paths:
|
paths:
|
||||||
- /caches/dangerzone-converter.tar.gz
|
- /tmp/caches/dangerzone-converter.tar.gz
|
||||||
- /caches/image-id.txt
|
- /tmp/caches/image-id.txt
|
||||||
|
|
||||||
convert-test-docs:
|
convert-test-docs:
|
||||||
machine:
|
machine:
|
||||||
|
@ -218,6 +218,33 @@ jobs:
|
||||||
PACKAGECLOUD_DISTRO: "ubuntu/groovy"
|
PACKAGECLOUD_DISTRO: "ubuntu/groovy"
|
||||||
<<: *deploy-packagecloud
|
<<: *deploy-packagecloud
|
||||||
|
|
||||||
|
build-debian-bookworm:
|
||||||
|
docker:
|
||||||
|
- image: debian:bookworm
|
||||||
|
resource_class: medium+
|
||||||
|
steps:
|
||||||
|
- run: *install-dependencies-deb
|
||||||
|
- checkout
|
||||||
|
- restore_cache: *restore-cache
|
||||||
|
- run: *copy-image
|
||||||
|
- run: *build-deb
|
||||||
|
|
||||||
|
deploy-debian-bookworm:
|
||||||
|
docker:
|
||||||
|
- image: debian:bookworm
|
||||||
|
resource_class: medium+
|
||||||
|
steps:
|
||||||
|
- run: *install-dependencies-deb
|
||||||
|
- checkout
|
||||||
|
- restore_cache: *restore-cache
|
||||||
|
- run: *copy-image
|
||||||
|
- run: *build-deb
|
||||||
|
- run:
|
||||||
|
environment:
|
||||||
|
PACKAGE_TYPE: "deb"
|
||||||
|
PACKAGECLOUD_DISTRO: "debian/bookworm"
|
||||||
|
<<: *deploy-packagecloud
|
||||||
|
|
||||||
build-debian-bullseye:
|
build-debian-bullseye:
|
||||||
docker:
|
docker:
|
||||||
- image: debian:bullseye
|
- image: debian:bullseye
|
||||||
|
@ -347,6 +374,9 @@ workflows:
|
||||||
- build-debian-bullseye:
|
- build-debian-bullseye:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
- build-debian-bookworm:
|
||||||
|
requires:
|
||||||
|
- build-container-image
|
||||||
- build-fedora-35:
|
- build-fedora-35:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
@ -389,6 +419,14 @@ workflows:
|
||||||
only: /^v.*/
|
only: /^v.*/
|
||||||
branches:
|
branches:
|
||||||
ignore: /.*/
|
ignore: /.*/
|
||||||
|
- deploy-debian-bookworm:
|
||||||
|
requires:
|
||||||
|
- build-container-image
|
||||||
|
filters:
|
||||||
|
tags:
|
||||||
|
only: /^v.*/
|
||||||
|
branches:
|
||||||
|
ignore: /.*/
|
||||||
- deploy-debian-bullseye:
|
- deploy-debian-bullseye:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
|
Loading…
Reference in a new issue