diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 145384f..f381ded 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -21,7 +21,7 @@ jobs: - nix-channels - rubygems-mirror - rustup-mirror - - shadowmire + # - shadowmire - tsumugu - tunasync-scripts # - freighter diff --git a/Dockerfile b/Dockerfile index 8549698..a4b534d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,12 @@ RUN if [ "$(uname -m)" != "x86_64" -a "$(uname -m)" != "i386" ]; then \ fi # RUN pip3 install --upgrade pip -# needs unpublished version of apitools, see: https://github.com/GoogleCloudPlatform/gsutil/issues/1819 -RUN python3 -m pip install gsutil https://github.com/google/apitools/archive/refs/tags/v0.5.35.zip --break-system-packages +RUN python3 -m pip install \ + # for flutter, needs unpublished version of apitools, see: https://github.com/GoogleCloudPlatform/gsutil/issues/1819 + gsutil https://github.com/google/apitools/archive/refs/tags/v0.5.35.zip \ + # for shadowmire + requests tqdm click \ + --break-system-packages RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && apt-get install -y locales -qq && locale-gen ENV LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 HOME=/tmp diff --git a/retired/dockerfiles/bandersnatch/Dockerfile b/retired/dockerfiles/bandersnatch/Dockerfile index 65e7e86..e8f772c 100644 --- a/retired/dockerfiles/bandersnatch/Dockerfile +++ b/retired/dockerfiles/bandersnatch/Dockerfile @@ -1,3 +1,5 @@ +# RETIRED: use shadowmire instead + ARG PY_VERSION=3.12 FROM python:${PY_VERSION}-alpine diff --git a/retired/dockerfiles/pub-mirror/Dockerfile b/retired/dockerfiles/pub-mirror/Dockerfile index 53c199e..77314db 100644 --- a/retired/dockerfiles/pub-mirror/Dockerfile +++ b/retired/dockerfiles/pub-mirror/Dockerfile @@ -1,3 +1,5 @@ +# RETIRED: use tunasync-scripts image and pub-mirror.py instead + FROM debian:stable AS dart-build ARG DART_VERSION="2.12.4" diff --git a/dockerfiles/shadowmire/Dockerfile b/retired/dockerfiles/shadowmire/Dockerfile similarity index 81% rename from dockerfiles/shadowmire/Dockerfile rename to retired/dockerfiles/shadowmire/Dockerfile index 5cd222e..e6632e4 100644 --- a/dockerfiles/shadowmire/Dockerfile +++ b/retired/dockerfiles/shadowmire/Dockerfile @@ -1,3 +1,5 @@ +# RETIRED: merged into tunasync-scripts image + ARG PY_VERSION=3.13 FROM python:${PY_VERSION}-alpine