diff --git a/LICENSE b/LICENSE index ca63b31..2d5385c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 First Look Media +Copyright (c) 2020-2021 First Look Media Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/RELEASE.md b/RELEASE.md index f1dc74d..c5a10c6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,7 +10,7 @@ Before making a release, all of these should be complete: - [ ] Update `share/version.txt` - [ ] Update version and download links in `README.md`, and screenshot if necessary - [ ] CHANGELOG.md should be updated to include a list of all major changes since the last release -- [ ] Test CircleCI Linux builds: Look in `.circleci/config.yml`, manually try each build in docker, and add new platforms and remove obsolete platforms +- [ ] In `.circleci/config.yml`, add new platforms and remove obsolete platforms - [ ] Create a test build in Windows and make sure it works - [ ] Create a test build in mcaOS and make sure it works - [ ] There must be a PGP-signed git tag for the version, e.g. for dangerzone 0.1.0, the tag must be `v0.1.0` diff --git a/dangerzone-converter/.circleci/config.yml b/dangerzone-converter/.circleci/config.yml deleted file mode 100644 index ebee675..0000000 --- a/dangerzone-converter/.circleci/config.yml +++ /dev/null @@ -1,108 +0,0 @@ -version: 2.1 - -executors: - docker-publisher: - environment: - IMAGE_NAME: flmcode/dangerzone - docker: - - image: circleci/python - -jobs: - - build: - executor: docker-publisher - steps: - - checkout - - setup_remote_docker - - run: - name: Build docker image - command: docker build -t $IMAGE_NAME:latest . - - run: - name: Archive docker image - command: docker save -o image.tar $IMAGE_NAME - - persist_to_workspace: - root: . - paths: - - ./image.tar - - publish-latest: - executor: docker-publisher - steps: - - attach_workspace: - at: /tmp/workspace - - setup_remote_docker - - run: - name: Load archived docker image - command: docker load -i /tmp/workspace/image.tar - - run: - name: Publish image to docker Hub - command: | - echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin - docker push $IMAGE_NAME:latest - - publish-tag: - executor: docker-publisher - steps: - - attach_workspace: - at: /tmp/workspace - - setup_remote_docker - - run: - name: Load archived docker image - command: docker load -i /tmp/workspace/image.tar - - run: - name: Publish image to docker Hub - command: | - echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin - IMAGE_TAG=${CIRCLE_TAG/v/''} - docker tag $IMAGE_NAME:latest $IMAGE_NAME:$IMAGE_TAG - docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:$IMAGE_TAG - -workflows: - version: 2 - build-stable: - jobs: - - build: - filters: - branches: - only: stable - - publish-latest: - requires: - - build - filters: - branches: - only: stable - build-tags: - jobs: - - build: - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - publish-tag: - requires: - - build - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - monthly: - triggers: - - schedule: - cron: "0 0 1 * *" - filters: - branches: - only: stable - jobs: - - build: - filters: - branches: - only: stable - - publish-latest: - requires: - - build - filters: - branches: - only: stable diff --git a/dangerzone-converter/Dockerfile b/dangerzone-converter/Dockerfile index bea4bfe..68c3084 100644 --- a/dangerzone-converter/Dockerfile +++ b/dangerzone-converter/Dockerfile @@ -87,7 +87,9 @@ RUN \ echo '/usr/bin/java -jar "/usr/local/bin/pdftk-all.jar" "$@"' >> /usr/local/bin/pdftk && \ chmod +x /usr/local/bin/pdftk -COPY scripts/* /usr/local/bin/ +COPY dangerzone.py /usr/local/bin/ +COPY document-to-pixels /usr/local/bin/ +COPY pixels-to-pdf /usr/local/bin/ # Add the unprivileged user RUN adduser -h /home/user -s /bin/sh -D user diff --git a/dangerzone-converter/LICENSE b/dangerzone-converter/LICENSE deleted file mode 100644 index ca63b31..0000000 --- a/dangerzone-converter/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 First Look Media - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/dangerzone-converter/README.md b/dangerzone-converter/README.md deleted file mode 100644 index 61f2978..0000000 --- a/dangerzone-converter/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# dangerzone-converter - -This is the container for [dangerzone](https://github.com/firstlookmedia/dangerzone), which converts potentially a dangerous PDF, office document, or image into a safe PDF. - -## Development notes - -Issues are tracked [here](https://github.com/firstlookmedia/dangerzone/issues?q=is%3Aissue+is%3Aopen+label%3Acontainer), in the dangerzone repository using the `container` label. - -Containers are built in continuous integration when commits are pushed to the `stable` branch. \ No newline at end of file diff --git a/dangerzone-converter/scripts/dangerzone.py b/dangerzone-converter/dangerzone.py similarity index 100% rename from dangerzone-converter/scripts/dangerzone.py rename to dangerzone-converter/dangerzone.py diff --git a/dangerzone-converter/scripts/document-to-pixels b/dangerzone-converter/document-to-pixels similarity index 100% rename from dangerzone-converter/scripts/document-to-pixels rename to dangerzone-converter/document-to-pixels diff --git a/dangerzone-converter/scripts/pixels-to-pdf b/dangerzone-converter/pixels-to-pdf similarity index 100% rename from dangerzone-converter/scripts/pixels-to-pdf rename to dangerzone-converter/pixels-to-pdf