diff --git a/.make/Makefile.mk b/.make/Makefile.mk index 91d79f28666483d6eab247a4ac3bbb677c6d97eb..5dc714bd24fd41747687518e8ac55e2c2ab2e39f 100644 --- a/.make/Makefile.mk +++ b/.make/Makefile.mk @@ -25,11 +25,7 @@ ifeq ($(strip $(CAR_OCI_REGISTRY_HOST)),) CAR_OCI_REGISTRY_HOST = artefact.skao.int endif -ifeq ($(strip $(CAR_OCI_REGISTRY_USERNAME)),) - CAR_OCI_REGISTRY_USERNAME = ska-telescope -endif - -IMAGE=$(CAR_OCI_REGISTRY_HOST)/$(CAR_OCI_REGISTRY_USERNAME)/$(NAME) +IMAGE=$(CAR_OCI_REGISTRY_HOST)/$(NAME) VERSION=$(shell . $(RELEASE_SUPPORT) ; getVersion) TAG=$(shell . $(RELEASE_SUPPORT); getTag) @@ -53,7 +49,7 @@ pre-push: post-push: docker-build: .release - docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg CAR_OCI_REGISTRY_HOST=$(CAR_OCI_REGISTRY_HOST) --build-arg CAR_OCI_REGISTRY_USERNAME=$(CAR_OCI_REGISTRY_USERNAME) --build-arg IMAGE_VERSION=$(VERSION) + docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg CAR_OCI_REGISTRY_HOST=$(CAR_OCI_REGISTRY_HOST) --build-arg IMAGE_VERSION=$(VERSION) @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \ diff --git a/Makefile b/Makefile index d3ce6e5bd4363650334ea4e651e96ff458bcc300..71c5d78696a38250016db663d87d7aae4c34051e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # # Project makefile for a SKA Tango Base project. You should normally only need to modify -# CAR_OCI_REGISTRY_USERNAME and PROJECT below. +# PROJECT below. # Use bash shell with pipefail option enabled so that the return status of a # piped command is the value of the last (rightmost) command to exit with a @@ -9,14 +9,11 @@ SHELL = /bin/bash .SHELLFLAGS = -o pipefail -c -# CAR_OCI_REGISTRY_HOST, CAR_OCI_REGISTRY_USERNAME and PROJECT are combined to define +# CAR_OCI_REGISTRY_HOST, and PROJECT are combined to define # the Docker tag for this project. The definition below inherits the standard # value for CAR_OCI_REGISTRY_HOST (=artefact.skao.int) and overwrites -# CAR_OCI_REGISTRY_USERNAME and PROJECT to give a final Docker tag of -# artefact.skao.int/ska-telescope/ska_tango_base -# -CAR_OCI_REGISTRY_USERNAME:=ska-telescope -PROJECT = ska_tango_base +# PROJECT to give a final Docker tag of artefact.skao.int/ska-tango-base +PROJECT = ska-tango-base IMAGE_FOR_DIAGRAMS = artefact.skao.int/ska-tango-images-pytango-builder:9.3.10 diff --git a/README.md b/README.md index adedf43fbc777b73b7e9f7df9c7799d28ac1660e..8ea49178bb6207358ecc3d84b37f1ae4612e02d0 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ class DishLeafNode(SKABaseDevice): #### PyCharm -The Docker integration is recommended. For development, use the `artefact.skao.int/ska-telescope/ska_tango_base:latest` image as the Python Interpreter for the project. Note that if `make` is run with targets like `build`, `up`, or `test`, that image will be rebuilt by Docker using the local code, and tagged as `latest`. +The Docker integration is recommended. For development, use the `artefact.skao.int/ska-tango-base:latest` image as the Python Interpreter for the project. Note that if `make` is run with targets like `build`, `up`, or `test`, that image will be rebuilt by Docker using the local code, and tagged as `latest`. As this project uses a `src` [folder structure](https://blog.ionelmc.ro/2014/05/25/python-packaging/#the-structure), so under _Preferences > Project Structure_, the `src` folder needs to be marked as "Sources". That will allow the interpreter to be aware of the package from folders like `tests` that are outside of `src`. When adding Run/Debug configurations, make sure "Add content roots to PYTHONPATH" and "Add source roots to PYTHONPATH" are checked.