From fdf14451878551389c4716317036f19236326ad0 Mon Sep 17 00:00:00 2001 From: simonmicro Date: Fri, 9 Dec 2022 20:16:01 +0100 Subject: [PATCH] Removed docs dependencies from requirements.txt Moved requirement-files into respective docker folders --- docker/docker-py3-kms-minimal/Dockerfile | 3 +-- docker/docker-py3-kms-minimal/requirements.txt | 2 ++ docker/docker-py3-kms/Dockerfile | 3 +-- docker/docker-py3-kms/requirements.txt | 2 ++ docker/requirements.txt | 5 ----- docker/requirements_minimal.txt | 4 ---- requirements.txt | 1 + 7 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 docker/docker-py3-kms-minimal/requirements.txt create mode 100644 docker/docker-py3-kms/requirements.txt delete mode 100644 docker/requirements.txt delete mode 100644 docker/requirements_minimal.txt create mode 120000 requirements.txt diff --git a/docker/docker-py3-kms-minimal/Dockerfile b/docker/docker-py3-kms-minimal/Dockerfile index ff6199e..789d562 100644 --- a/docker/docker-py3-kms-minimal/Dockerfile +++ b/docker/docker-py3-kms-minimal/Dockerfile @@ -15,12 +15,11 @@ ENV LOGSIZE "" ENV TYPE MINIMAL COPY ./py-kms /home/py-kms -COPY docker/requirements_minimal.txt /home/py-kms/requirements.txt +COPY docker/docker-py3-kms-minimal/requirements.txt /home/py-kms/requirements.txt RUN apk add --no-cache --update \ bash \ python3 \ py3-pip \ - python3-tkinter \ ca-certificates \ shadow \ tzdata \ diff --git a/docker/docker-py3-kms-minimal/requirements.txt b/docker/docker-py3-kms-minimal/requirements.txt new file mode 100644 index 0000000..4159f71 --- /dev/null +++ b/docker/docker-py3-kms-minimal/requirements.txt @@ -0,0 +1,2 @@ +dnspython==2.2.1 +tzlocal==4.2 \ No newline at end of file diff --git a/docker/docker-py3-kms/Dockerfile b/docker/docker-py3-kms/Dockerfile index 4b7dab0..c316ab2 100644 --- a/docker/docker-py3-kms/Dockerfile +++ b/docker/docker-py3-kms/Dockerfile @@ -17,12 +17,11 @@ ENV LOGSIZE "" ENV TZ America/Chicago COPY py-kms /home/py-kms/ -COPY docker/requirements.txt /home/py-kms/ +COPY docker/docker-py3-kms/requirements.txt /home/py-kms/ RUN apk add --no-cache --update \ bash \ python3 \ py3-pip \ - python3-tkinter \ sqlite-libs \ ca-certificates \ tzdata \ diff --git a/docker/docker-py3-kms/requirements.txt b/docker/docker-py3-kms/requirements.txt new file mode 100644 index 0000000..4159f71 --- /dev/null +++ b/docker/docker-py3-kms/requirements.txt @@ -0,0 +1,2 @@ +dnspython==2.2.1 +tzlocal==4.2 \ No newline at end of file diff --git a/docker/requirements.txt b/docker/requirements.txt deleted file mode 100644 index bad41ef..0000000 --- a/docker/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -Flask==2.1.2 -Pygments==2.12.0 -dnspython==2.2.1 -tzlocal==4.2 -sqlite-web==0.4.0 \ No newline at end of file diff --git a/docker/requirements_minimal.txt b/docker/requirements_minimal.txt deleted file mode 100644 index 509c137..0000000 --- a/docker/requirements_minimal.txt +++ /dev/null @@ -1,4 +0,0 @@ -Flask==2.1.2 -Pygments==2.12.0 -dnspython==2.2.1 -tzlocal==4.2 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 120000 index 0000000..bec651b --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +docker/docker-py3-kms/requirements.txt \ No newline at end of file