Task/fp 1461 convert core cms to poetry (#468)

* Initialized poetry 1.1.13 in the existing cms codebase to generate the pyproject.tml file with no added dependencies or dev-dependencies.

* Completed changes to Makefile to align with usage in Portal. AFter poetry transition gets meged, Jenkins will need to be modified to call the new build-full target in the CMS codebase.

* Added the requirements.txt dependencies manually to the pyproject.toml file to test installation against Dockerfile. Edits to Dockerfile are next.

* Changed the name of the pyproject.toml to be more specific.

* Added poetry setup and build steps to the Dockerfile. Builds and runs succesfully using both the build and build-full make commands.

* Update Dockerfile

Great catch!

Co-authored-by: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com>

* Update pyproject.toml

Removing unused dev dependencies.

Co-authored-by: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com>

Author: taoteg

Dockerfile

@@ -6,23 +6,61 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV PYTHONUNBUFFERED 1
 
+# https://python-poetry.org/docs/configuration/#using-environment-variables
+ENV POETRY_VERSION=1.1.0 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    POETRY_NO_INTERACTION=1 \
+    PYSETUP_PATH="/opt/pysetup" \
+    VENV_PATH="/opt/pysetup/.venv"
+
+# prepend poetry and venv to path
+ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+
+FROM python-base as builder-base
+
 RUN apt-get update && apt-get install -y \
     build-essential python3-dev \
     libldap2-dev libsasl2-dev ldap-utils tox \
     lcov valgrind vim \
     && pip3 install uwsgi
 
+RUN pip3 install --upgrade pip setuptools wheel
+
+# Install Poetry - respects $POETRY_VERSION & $POETRY_HOME
+RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3
+
+# copy project requirement files here to ensure they will be cached.
+WORKDIR $PYSETUP_PATH
+COPY pyproject.toml poetry.lock ./
+
+# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
+RUN poetry install --no-dev
+
+# `development` image is used for local development
+FROM python-base as development
+WORKDIR $PYSETUP_PATH
+
+# copy in our built poetry + venv
+COPY --from=builder-base $POETRY_HOME $POETRY_HOME
+COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
+
+# quicker install as runtime deps are already installed
+RUN poetry install
+
+# `production` image is used for deployed runtime environments
+FROM python-base as production
+
 # install node 12.x
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get install -y nodejs
 
+COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
+
 # load files
 RUN mkdir /code
 COPY . /code
 WORKDIR /code
 
-# install python packages
-RUN pip3 install --no-cache-dir -r requirements.txt
-
 # build assets
 RUN npm ci && npm run build

Makefile

@@ -2,24 +2,32 @@ DOCKERHUB_REPO := taccwma/$(shell cat ./docker_repo.var)
 DOCKER_TAG ?= $(shell git rev-parse --short HEAD)
 DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG)
 DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest
-DOCKER_IMAGE_LOCAL := $(DOCKERHUB_REPO):local
 
 .PHONY: build
 build:
-	docker build -t $(DOCKER_IMAGE) .
-	docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST)
+	docker-compose -f ./docker-compose.yml build
+
+.PHONY: build-full
+build-full:
+	docker build -t $(DOCKER_IMAGE) --target production -f ./Dockerfile .
 
 .PHONY: publish
 publish:
 	docker push $(DOCKER_IMAGE)
 
 .PHONY: publish-latest
 publish-latest:
+	docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST)
 	docker push $(DOCKER_IMAGE_LATEST)
 
 .PHONY: start
 start:
 	docker-compose -f docker-compose.yml up
 
-requirements-frozen.txt: build
-	docker run --rm $(DOCKER_IMAGE) pip freeze > $@
+.PHONY: stop
+stop:
+	docker-compose -f docker-compose.yml down
+
+.PHONY: stop-verbose
+stop-v:
+	docker-compose -f docker-compose.yml down -v