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

Rename the container in CircleCI

Browse source
This commit is contained in:
Micah Lee 2021-11-29 16:04:20 -08:00
parent 433639d51f
commit 42f8fb9e2f
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.circleci/config.yml
View file

@ -28,15 +28,15 @@ aliases:
ls -lh dist/dangerzone-*-1.noarch.rpm ls -lh dist/dangerzone-*-1.noarch.rpm
- &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 "container/Dockerfile" }}-{{ checksum "container/dangerzone.py" }}-{{ checksum "container/document-to-pixels" }}-{{ checksum "container/pixels-to-pdf" }}
paths: paths:
- /caches/dangerzone-converter.tar.gz - /caches/container.tar.gz
- /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 /caches/dangerzone-converter.tar.gz share/ cp /caches/container.tar.gz share/
cp /caches/image-id.txt share/ cp /caches/image-id.txt share/
- &deploy-packagecloud - &deploy-packagecloud
@ -71,31 +71,31 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- v1-{{ checksum "dangerzone-converter/Dockerfile" }}-{{ checksum "dangerzone-converter/dangerzone.py" }}-{{ checksum "dangerzone-converter/document-to-pixels" }}-{{ checksum "dangerzone-converter/pixels-to-pdf" }} - v1-{{ checksum "container/Dockerfile" }}-{{ checksum "container/dangerzone.py" }}-{{ checksum "container/document-to-pixels" }}-{{ checksum "container/pixels-to-pdf" }}
- setup_remote_docker - setup_remote_docker
- run: - run:
name: Build Dangerzone image name: Build Dangerzone image
command: | command: |
if [ -f "/caches/dangerzone-converter.tar.gz" ]; then if [ -f "/caches/container.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 --platform linux/amd64 --tag dangerzone.rocks/dangerzone container
fi fi
- 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 "/caches/container.tar.gz" ]; then
echo "Already cached, skipping" echo "Already cached, skipping"
else else
mkdir -p /caches mkdir -p /caches
docker save -o /caches/dangerzone-converter.tar dangerzone.rocks/dangerzone docker save -o /caches/container.tar dangerzone.rocks/dangerzone
gzip -f /caches/dangerzone-converter.tar gzip -f /caches/container.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 > /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 "container/Dockerfile" }}-{{ checksum "container/dangerzone.py" }}-{{ checksum "container/document-to-pixels" }}-{{ checksum "container/pixels-to-pdf" }}
paths: paths:
- /caches/dangerzone-converter.tar.gz - /caches/container.tar.gz
- /caches/image-id.txt - /caches/image-id.txt
convert-test-docs: convert-test-docs:

3
install/windows/build-image.py
View file

@ -11,7 +11,8 @@ def main():
"build", "build",
"container", "container",
"--platform", "--platform",
"linux/amd64" "--tag", "linux/amd64",
"--tag",
"dangerzone.rocks/dangerzone", "dangerzone.rocks/dangerzone",
] ]
) )