[CDAPI-78]: Added new virtual environment for use by the mocks

Author: nhsd-jack-wainwright

Makefile

@@ -17,12 +17,39 @@ dockerNetwork := pathology-local
 # Example CI/CD targets are: dependencies, build, publish, deploy, clean, etc.
 
 .PHONY: dependencies
+.ONESHELL:
 dependencies: # Install dependencies needed to build and test the project @Pipeline
-	@cd pathology-api && poetry sync
-	@cd ../mocks && poetry sync
+	if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		eval "$$(pyenv init -)"; \
+		pyenv activate pathology; \
+	fi
+
+	cd pathology-api && poetry sync
+	cd ../
+
+	if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		pyenv deactivate pathology; \
+	fi
+
+	if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		pyenv activate pathology-mocks; \
+	fi
+
+	cd mocks && poetry sync
+	cd ../
+
+	if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		pyenv deactivate pathology-mocks; \
+	fi
 
 .PHONY: build-pathology
+.ONESHELL:
 build-pathology:
+	@if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		eval "$$(pyenv init -)"; \
+		pyenv activate pathology; \
+	fi
+
 	@cd pathology-api
 	@echo "Starting build for pathology API..."
 	@echo "Running type checks..."
@@ -37,8 +64,18 @@ build-pathology:
 	@cd ./target/pathology-api
 	@zip -r "../artifact.zip" .
 
+	@if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		pyenv deactivate pathology; \
+	fi
+
 .PHONY: build-mocks
+.ONESHELL:
 build-mocks:
+	@if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		eval "$$(pyenv init -)"; \
+		pyenv activate pathology-mocks; \
+	fi
+
 	@cd mocks
 	@echo "Starting build for mocks..."
 	@echo "Running type checks..."
@@ -53,6 +90,10 @@ build-mocks:
 	@cd ./target/mocks
 	@zip -r "../artifact.zip" .
 
+	@if [[ "$${IN_BUILD_CONTAINER}" == "true" ]]; then \
+		pyenv deactivate pathology-mocks; \
+	fi
+
 .PHONY: build
 build: clean-artifacts dependencies build-pathology build-mocks
 	@echo "Built artifacts for both pathology and mocks"

infrastructure/images/build-container/Dockerfile

@@ -133,6 +133,7 @@ ENV PATH="$PIPX_BIN_DIR:$PATH"
 
 # Create a virtual environment for development
 RUN bash -c "source ~/.bashrc && pyenv virtualenv ${PYTHON_VERSION} pathology" \
+    && bash -c "source ~/.bashrc && pyenv virtualenv ${PYTHON_VERSION} pathology-mocks" \
     # Install markdownlint-cli
     && npm install -g --ignore-scripts markdownlint-cli \
     && export PATH \

infrastructure/images/build-container/resources/.bashrc

@@ -14,7 +14,4 @@ export PATH="/pipx/bin:$PATH"
 eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 
-# Auto-activate pathology environment
-pyenv shell pathology 2>/dev/null || true
-
 alias docker="doas docker"

mocks/.python-version

@@ -0,0 +1 @@
+pathology-mocks