From 3cf1de6d819dbaa2b387de8c96c91766927103fc Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Thu, 9 May 2024 15:52:51 +0200 Subject: [PATCH] Remove out of date docker related code Until we add new, up-to-date docker examples --- Dockerfile | 34 ------------------------------- docker-compose.ci.yml | 21 -------------------- docker-compose.yml | 24 ---------------------- docker-entrypoint.sh | 44 ----------------------------------------- sublime.sublime-project | 21 -------------------- 5 files changed, 144 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.ci.yml delete mode 100644 docker-compose.yml delete mode 100755 docker-entrypoint.sh delete mode 100644 sublime.sublime-project diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index aa8b93c1..00000000 --- a/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM python:3.6-alpine -LABEL maintainer="jonathan@argpar.se" - -ENV PYTHONUNBUFFERED 1 - -# init -RUN apk --no-cache add --update \ - bash \ - postgresql-client \ - postgresql-dev \ - build-base \ - gettext \ - && pip install pip --upgrade \ - && pip install pipenv - -# app directory -RUN mkdir /app -WORKDIR /app - -# Copy dependency first to reduce rebuild time -COPY Pipfile /app/ -COPY Pipfile.lock /app/ - -ARG PIPENV_CFG - -# setup -RUN pipenv install --system --deploy $PIPENV_CFG - -COPY . /app - -RUN ["chmod", "+x", "docker-entrypoint.sh"] - -# CMD [ "python", "manage.py" ] -ENTRYPOINT [ "./docker-entrypoint.sh" ] diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml deleted file mode 100644 index 6e50092e..00000000 --- a/docker-compose.ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3.5" - -services: - - postgres: - image: postgres:10 - restart: always - env_file: .env - - django: - depends_on: - - postgres - build: . - command: coverage - ports: - - "8000:8000" - restart: on-failure - volumes: - - .:/app - stdin_open: true - tty: true \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 870e369c..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: "3.5" - -services: - - postgres: - image: postgres:10 - restart: always - env_file: .env - - django: - depends_on: - - postgres - build: - context: . - args: - PIPENV_CFG: --dev - command: migrate run_dev - ports: - - "8000:8000" - restart: on-failure - volumes: - - .:/app - stdin_open: true - tty: true diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index fd199847..00000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -e - -####### -# Killer function -die() { - printf '%s\n' "$1" >&2 - exit 1 -} -####### -# Argument loop -while (( $# )); do - case $1 in - migrate) - python manage.py migrate || exit $? - ;; - collectstatic) - python manage.py collectstatic --noinput || exit $? - ;; - coverage) - coverage run --source='.' manage.py test && coverage report || exit $? - ;; - run_dev) - python manage.py runserver 0:8000 || exit $? - ;; - run) - gunicorn -c gunicorn_config.ini media_observation_database.wsgi || exit $? - ;; - pass) - if [ "$2" ]; then - python manage.py "$2" || exit $? - shift - else - die 'ERROR: "pass" requires a non-empty option argument.' - fi - ;; - *) - break - esac - - shift -done - -exec "$@" diff --git a/sublime.sublime-project b/sublime.sublime-project deleted file mode 100644 index a4f3d293..00000000 --- a/sublime.sublime-project +++ /dev/null @@ -1,21 +0,0 @@ -{ - "build_systems": - [ - { - "file_regex": "^[ ]*File \"(...*?)\", line ([0-9]*)", - "name": "Anaconda Python Builder", - "selector": "source.python", - "shell_cmd": "\"venv/bin/python\" -u \"$file\"" - } - ], - "folders": - [ - { - "path": "." - } - ], - "settings": - { - "python_interpreter": "venv/bin/python" - } -}