From 6c0daf94103c5257cdf19331f8e3d168c41d86b2 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Fri, 15 Sep 2023 21:59:00 +1000 Subject: [PATCH] Remove older Debian Dockerfiles --- Dockerfile-debian-bullseye | 12 ------------ Dockerfile-debian-buster | 10 ---------- Dockerfile-debian-stretch | 14 -------------- deploy/install.yml | 1 + 4 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 Dockerfile-debian-bullseye delete mode 100644 Dockerfile-debian-buster delete mode 100644 Dockerfile-debian-stretch diff --git a/Dockerfile-debian-bullseye b/Dockerfile-debian-bullseye deleted file mode 100644 index 6651ce7a..00000000 --- a/Dockerfile-debian-bullseye +++ /dev/null @@ -1,12 +0,0 @@ -# docker build --tag sfconservancy.org-bullseye - < Dockerfile-debian-bullseye -# docker run --tty --interactive --rm=true --publish=8000:8000 --mount type=bind,source=$(pwd),target=/var/www/website --mount type=bind,source=$(pwd)/conservancy-website.sqlite3,target=/var/lib/www/database/conservancy-website.sqlite3 sfconservancy.org-bullseye:latest - -ARG DEBIAN_FRONTEND=noninteractive - -FROM debian:bullseye -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y python3 python3-pip python3-wheel sqlite3 -RUN apt-get install -y python3-django python3-bs4 python3-django-countries -RUN python3 -m pip freeze -WORKDIR /var/www/website/www -ENTRYPOINT ["python3", "/var/www/website/www/manage.py", "runserver", "0.0.0.0:8000"] diff --git a/Dockerfile-debian-buster b/Dockerfile-debian-buster deleted file mode 100644 index 050bc2c0..00000000 --- a/Dockerfile-debian-buster +++ /dev/null @@ -1,10 +0,0 @@ -# docker build --tag sfconservancy.org-buster - < Dockerfile-debian-buster -# docker run --tty --interactive --rm=true --publish=8000:8000 --mount type=bind,source=$(pwd),target=/var/www/website --mount type=bind,source=$(pwd)/conservancy-website.sqlite3,target=/var/lib/www/database/conservancy-website.sqlite3 sfconservancy.org-buster:latest - -ARG DEBIAN_FRONTEND=noninteractive - -FROM debian:buster -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y python3 python3-pip python3-wheel sqlite3 -RUN apt-get install -y python3-django python3-bs4 python3-django-countries -ENTRYPOINT ["python3", "/var/www/website/www/manage.py", "runserver", "0.0.0.0:8000"] diff --git a/Dockerfile-debian-stretch b/Dockerfile-debian-stretch deleted file mode 100644 index 433bf701..00000000 --- a/Dockerfile-debian-stretch +++ /dev/null @@ -1,14 +0,0 @@ -# docker build --tag sfconservancy.org-stretch - < Dockerfile-debian-stretch -# docker run --tty --interactive --rm=true --publish=8000:8000 --mount type=bind,source=$(pwd),target=/var/www/website --mount type=bind,source=$(pwd)/conservancy-website.sqlite3,target=/var/lib/www/database/conservancy-website.sqlite3 sfconservancy.org-stretch:latest - -ARG DEBIAN_FRONTEND=noninteractive - -FROM debian:stretch -# Default Stretch repositories are no longer available, so replacing with archive. -RUN echo "deb http://archive.debian.org/debian/ stretch main" > /etc/apt/sources.list -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y python3 python3-pip python3-wheel sqlite3 -RUN apt-get install -y python3-django python3-bs4 python3-django-countries -RUN python3 -m pip freeze -WORKDIR /var/www/website/www -ENTRYPOINT ["python3", "/var/www/website/www/manage.py", "runserver", "0.0.0.0:8000"] diff --git a/deploy/install.yml b/deploy/install.yml index 5f97bb39..9b2837bb 100644 --- a/deploy/install.yml +++ b/deploy/install.yml @@ -133,6 +133,7 @@ group: www-data mode: '0755' + # TODO: Needs to force owner to www-data:www-data - name: Git checkout ansible.builtin.git: repo: 'https://k.sfconservancy.org/website'