diff --git a/.dockerignore b/.dockerignore index c6b1a7fd..6f737391 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ .cache CONTRIBUTING.md -README.md .coverage .coverage.* docker-compose.* diff --git a/Dockerfile b/Dockerfile index 77937c36..bf713d20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,13 +30,11 @@ ENV UWSGI_INI /app/uwsgi.ini RUN pip install -U poetry ARG INSTALL_DEV_DEPENDENCIES=false -COPY pyproject.toml poetry.lock $APP_HOME/ +COPY . $APP_HOME RUN if [ "$INSTALL_DEV_DEPENDENCIES" = "true" ]; then poetry install; else poetry install --no-dev; fi USER alexandria -COPY . $APP_HOME - EXPOSE 8000 CMD /bin/sh -c "wait-for-it.sh $DATABASE_HOST:${DATABASE_PORT:-5432} -- poetry run python ./manage.py migrate && poetry run uwsgi" diff --git a/poetry.lock b/poetry.lock index 6876fe1c..6252dafc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2844,4 +2844,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.8.1" -content-hash = "211ad5e453ab27069b548e5855c7acf17a93471e873103c5c040711da066921a" +content-hash = "553f33b7c39049b26bf0e734537729140f519462061907db19d26b4736ba37ab" diff --git a/pyproject.toml b/pyproject.toml index e63cf4cb..49e606b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "alexandria" +name = "caluma-alexandria" version = "0.3.0" description = "Document management service" repository = "https://github.com/projectcaluma/alexandria" @@ -17,6 +17,9 @@ exclude = [ "alexandria/conftest.py", "alexandria/**/tests", ] +packages = [ + { include = "alexandria" } +] [tool.poetry.dependencies] python = "^3.8.1"