almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Try preparing permissions cache dir ahead of time

Browse source
This commit is contained in:
Micah Lee 2021-11-24 14:39:38 -08:00
parent a61cab6d3c
commit f664ca0509
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.circleci/config.yml
View file

@ -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:
- /tmp/caches/dangerzone-converter.tar.gz - /caches/dangerzone-converter.tar.gz
- /tmp/caches/image-id.txt - /caches/image-id.txt
- &copy-image - &copy-image
name: Copy container image into package name: Copy container image into package
command: | command: |
cp /tmp/caches/dangerzone-converter.tar.gz share/ cp /caches/dangerzone-converter.tar.gz share/
cp /tmp/caches/image-id.txt share/ cp /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 "/tmp/caches/dangerzone-converter.tar.gz" ]; then if [ -f "/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 "/tmp/caches/dangerzone-converter.tar.gz" ]; then if [ -f "/caches/dangerzone-converter.tar.gz" ]; then
echo "Already cached, skipping" echo "Already cached, skipping"
else else
mkdir -p /tmp/caches mkdir -p /caches
docker save -o /tmp/caches/dangerzone-converter.tar dangerzone.rocks/dangerzone docker save -o /caches/dangerzone-converter.tar dangerzone.rocks/dangerzone
gzip -f /tmp/caches/dangerzone-converter.tar gzip -f /caches/dangerzone-converter.tar
docker image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > /tmp/caches/image-id.txt docker image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > /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:
- /tmp/caches/dangerzone-converter.tar.gz - /caches/dangerzone-converter.tar.gz
- /tmp/caches/image-id.txt - /caches/image-id.txt
convert-test-docs: convert-test-docs:
machine: machine:
@ -120,6 +120,11 @@ jobs:
sudo apt-get -qq --yes install podman sudo apt-get -qq --yes install podman
podman --version podman --version
- checkout - checkout
- run:
name: Prepare cache directory
command: |
sudo mkdir -p /caches
sudo chown -R $USER:$USER /caches
- restore_cache: *restore-cache - restore_cache: *restore-cache
- run: *copy-image - run: *copy-image
- run: - run: