From 02e63e5a49e54fe0b678411db49afc8b9cdcab01 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Thu, 16 Jan 2025 19:00:04 +0200 Subject: [PATCH] FIXUP: Rename dangerzone/container to dangerzone/container_helpers --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- Dockerfile | 4 ++-- Dockerfile.in | 4 ++-- dangerzone/{container => container_helpers}/entrypoint.py | 0 dangerzone/{container => container_helpers}/gvisor.key | 0 .../repro-sources-list.sh | 0 dodo.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename dangerzone/{container => container_helpers}/entrypoint.py (100%) rename dangerzone/{container => container_helpers}/gvisor.key (100%) rename dangerzone/{container => container_helpers}/repro-sources-list.sh (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4c3b13..108cb37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: id: cache-container-image uses: actions/cache@v4 with: - key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container/*', 'install/common/build-image.py') }} + key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container_helpers/*', 'install/common/build-image.py') }} path: | share/container.tar.gz share/image-id.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a78f2f4..52772db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: id: cache-container-image uses: actions/cache@v4 with: - key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container/*', 'install/common/build-image.py') }} + key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container_helpers/*', 'install/common/build-image.py') }} path: |- share/container.tar.gz share/image-id.txt @@ -226,7 +226,7 @@ jobs: - name: Restore container cache uses: actions/cache/restore@v4 with: - key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container/*', 'install/common/build-image.py') }} + key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container_helpers/*', 'install/common/build-image.py') }} path: |- share/container.tar.gz share/image-id.txt @@ -333,7 +333,7 @@ jobs: - name: Restore container image uses: actions/cache/restore@v4 with: - key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container/*', 'install/common/build-image.py') }} + key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container_helpers/*', 'install/common/build-image.py') }} path: |- share/container.tar.gz share/image-id.txt @@ -428,7 +428,7 @@ jobs: - name: Restore container image uses: actions/cache/restore@v4 with: - key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container/*', 'install/common/build-image.py') }} + key: v4-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/*.py', 'dangerzone/container_helpers/*', 'install/common/build-image.py') }} path: |- share/container.tar.gz share/image-id.txt diff --git a/Dockerfile b/Dockerfile index 99eb446..9ea3a2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN \ --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=bind,source=./container/repro-sources-list.sh,target=/usr/local/bin/repro-sources-list.sh \ - --mount=type=bind,source=./container/gvisor.key,target=/tmp/gvisor.key \ + --mount=type=bind,source=./container_helpers/repro-sources-list.sh,target=/usr/local/bin/repro-sources-list.sh \ + --mount=type=bind,source=./container_helpers/gvisor.key,target=/tmp/gvisor.key \ : "Hacky way to set a date for the Debian snapshot repos" && \ touch -d ${DEBIAN_ARCHIVE_DATE} /etc/apt/sources.list.d/debian.sources && \ touch -d ${DEBIAN_ARCHIVE_DATE} /etc/apt/sources.list && \ diff --git a/Dockerfile.in b/Dockerfile.in index 42b55d6..981b716 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -19,8 +19,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN \ --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=bind,source=./container/repro-sources-list.sh,target=/usr/local/bin/repro-sources-list.sh \ - --mount=type=bind,source=./container/gvisor.key,target=/tmp/gvisor.key \ + --mount=type=bind,source=./container_helpers/repro-sources-list.sh,target=/usr/local/bin/repro-sources-list.sh \ + --mount=type=bind,source=./container_helpers/gvisor.key,target=/tmp/gvisor.key \ : "Hacky way to set a date for the Debian snapshot repos" && \ touch -d ${DEBIAN_ARCHIVE_DATE} /etc/apt/sources.list.d/debian.sources && \ touch -d ${DEBIAN_ARCHIVE_DATE} /etc/apt/sources.list && \ diff --git a/dangerzone/container/entrypoint.py b/dangerzone/container_helpers/entrypoint.py similarity index 100% rename from dangerzone/container/entrypoint.py rename to dangerzone/container_helpers/entrypoint.py diff --git a/dangerzone/container/gvisor.key b/dangerzone/container_helpers/gvisor.key similarity index 100% rename from dangerzone/container/gvisor.key rename to dangerzone/container_helpers/gvisor.key diff --git a/dangerzone/container/repro-sources-list.sh b/dangerzone/container_helpers/repro-sources-list.sh similarity index 100% rename from dangerzone/container/repro-sources-list.sh rename to dangerzone/container_helpers/repro-sources-list.sh diff --git a/dodo.py b/dodo.py index 9fa48a8..2022ffa 100644 --- a/dodo.py +++ b/dodo.py @@ -54,7 +54,7 @@ TESSDATA_TARGETS = list_language_data() IMAGE_DEPS = [ "Dockerfile", *list_files("dangerzone/conversion"), - *list_files("dangerzone/container"), + *list_files("dangerzone/container_helpers"), "install/common/build-image.py", ] IMAGE_TARGETS = ["share/container.tar.gz", "share/image-id.txt"]