From 450eb3137e5590cc49bcd2a70de81eba64793915 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Wed, 7 Jul 2021 20:48:28 -0700 Subject: [PATCH] Remove Docker deployment support files --- .gitignore | 3 --- Dockerfile | 16 ------------ README.md | 6 ++--- docker-compose.example.sqlite.yml | 29 --------------------- docker-compose.example.yml | 43 ------------------------------- 5 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.example.sqlite.yml delete mode 100644 docker-compose.example.yml diff --git a/.gitignore b/.gitignore index 4cca7669..896f8366 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,6 @@ # Virtual environment files (pipenv may use this convention). .venv -# Docker deployment files. -docker-compose.yml - # IDE configuration files. /.idea diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0b69e996..00000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM python:3.8-slim as app -ENV PYTHONUNBUFFERED 1 -RUN pip install --upgrade pipenv gunicorn -WORKDIR /app -COPY Pipfile /app/ -RUN pipenv lock -RUN pipenv install --deploy --system -COPY manage.py /app/ -COPY api /app/api -COPY babybuddy /app/babybuddy -COPY core /app/core -COPY dashboard /app/dashboard -COPY locale /app/locale -COPY reports /app/reports -COPY static /app/static -COPY etc/gunicorn.py /app/ diff --git a/README.md b/README.md index f792d445..01dbb96a 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,9 @@ services: restart: unless-stopped ``` -:warning: Baby Buddy is deployed to Docker Hub as -[babybuddy/babybuddy](https://hub.docker.com/r/babybuddy/babybuddy) however this -deployment will be stopped after version v1.7.0 in favor of the LSIO solution. +:warning: Baby Buddy v1.7.0 was the final version deployed to +[babybuddy/babybuddy](https://hub.docker.com/r/babybuddy/babybuddy) on Docker Hub +Future versions of Baby Buddy will use the LSIO container. ### Heroku diff --git a/docker-compose.example.sqlite.yml b/docker-compose.example.sqlite.yml deleted file mode 100644 index 100975a5..00000000 --- a/docker-compose.example.sqlite.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: "2.4" -services: - app: - image: babybuddy/babybuddy - container_name: babybuddyapp # Container_name is an optional value for single-container - # deployments to set a friendly container name. - # Disable in swarm or other multi-container setups. - # See README.md#configuration for other environment configuration options. - environment: - - ALLOWED_HOSTS=localhost # comma separated list of IP addresses or hosts that can access the web UI - - DJANGO_SETTINGS_MODULE=babybuddy.settings.base - - SECRET_KEY= # Generate a random string here to secure the Django instance - - TIME_ZONE= # In the tzdata format, IE, "America/Denver" - - DEBUG=False # Turn to False in production - volumes: - - data:/app/data:rw - - media:/app/media:rw - command: |- - bash -c 'python manage.py migrate --noinput && - python manage.py createcachetable && - gunicorn babybuddy.wsgi -b :8000 --log-level=info \ - --worker-tmp-dir=/dev/shm --log-file=- \ - --workers=2 --threads=4 --worker-class=gthread' - ports: - - "8000:8000" # For Portainer, select another port for babybuddy such as 7000, for example "7000:8000" - restart: unless-stopped -volumes: - data: {} - media: {} diff --git a/docker-compose.example.yml b/docker-compose.example.yml deleted file mode 100644 index d07ec3ea..00000000 --- a/docker-compose.example.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: "2.4" -services: - db: - image: postgres:11 # pin postgres to a major version - container_name: babybuddydb # Container_name is an optional value for single-container - # deployments to set a friendly container name. - # Disable in swarm or other multi-container setups. - environment: - - PGDATA=/db-data - - POSTGRES_PASSWORD=postgres # must correspond with DB_PASSWORD in APP - volumes: - - db:/db-data:rw - restart: unless-stopped - app: - image: babybuddy/babybuddy - container_name: babybuddyapp # Container_name is an optional value for single-container - # deployments to set a friendly container name. - # Disable in swarm or other multi-container setups. - # See README.md#configuration for other environment configuration options. - environment: - - ALLOWED_HOSTS=localhost # comma separated list of IP addresses or hosts that can access the web UI - - DB_PASSWORD=postgres # must correspond with POSTGRES_PASSWORD in DB - - DJANGO_SETTINGS_MODULE=babybuddy.settings.docker - - SECRET_KEY= # Generate a random string here to secure the Django instance - - TIME_ZONE= # In the tzdata format, IE, "America/Denver" - - DEBUG=False # Turn to False in production - volumes: - - media:/app/media:rw - # Sleep 5 seconds to allow the db to to come up; - command: |- - bash -c 'python manage.py migrate --noinput && - python manage.py createcachetable && - gunicorn babybuddy.wsgi -b :8000 --log-level=info \ - --worker-tmp-dir=/dev/shm --log-file=- \ - --workers=2 --threads=4 --worker-class=gthread' - ports: - - "8000:8000" # For Portainer, select another port for babybuddy such as 7000, for example "7000:8000" - restart: unless-stopped - depends_on: - - db -volumes: - db: {} - media: {}