diff --git a/.app_env b/.app_env index b0154d45..8c86872f 100644 --- a/.app_env +++ b/.app_env @@ -1,4 +1,4 @@ -REGISTRY=azimuth +REGISTRY=servicenowdocker BACKEND_VERSION=latest FRONTEND_VERSION=latest DEVICE=cpu diff --git a/CHANGELOG.md b/CHANGELOG.md index b50a6ebe..00e9d26a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - added "Without Postprocessing" feature to enable/disable post processing feature on the data ### Changed +- Renamed our docker images to use `servicenowdocker` registry on Docker Hub. ### Deprecated/Breaking Changes diff --git a/Makefile b/Makefile index 10d96c10..758b5431 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -REGISTRY = azimuth +REGISTRY = servicenowdocker IMAGE = azimuth TAG = latest DEVICE = cpu @@ -31,14 +31,14 @@ build_be: docker build \ --build-arg DEVICE=$(DEVICE) \ --build-arg STAGE=$(STAGE) \ - -t $(REGISTRY)/$(IMAGE)_$(DEVICE):$(TAG)$(TAG_EXT) \ + -t $(REGISTRY)/$(IMAGE):$(TAG)_$(DEVICE)$(TAG_EXT) \ . .PHONY: build_fe build_fe: docker build \ --target $(STAGE) \ - -t $(REGISTRY)/$(IMAGE)_app:$(TAG)$(TAG_EXT) \ + -t $(REGISTRY)/$(IMAGE)-app:$(TAG)$(TAG_EXT) \ webapp/. .PHONY: compose @@ -47,3 +47,8 @@ compose: build launch .PHONY: launch launch: docker-compose -f docker-compose.yml $(COMPOSE_EXT) --env-file $(ENV_FILE) up + +.PHONY: push +push: + docker push $(REGISTRY)/$(IMAGE):$(TAG)_$(DEVICE)$(TAG_EXT) + docker push $(REGISTRY)/$(IMAGE)-app:$(TAG)$(TAG_EXT) diff --git a/docker-compose.yml b/docker-compose.yml index f1c105c6..470ce50e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: backend: - image: ${REGISTRY}/azimuth_${DEVICE}:${BACKEND_VERSION} + image: ${REGISTRY}/azimuth:${BACKEND_VERSION}_${DEVICE} environment: - "CFG_PATH=${CFG_PATH}" - "SENTENCE_TRANSFORMERS_HOME=/azimuth_shr/sentence_transformers" @@ -20,7 +20,7 @@ services: extra_hosts: - "host.docker.internal:host-gateway" web: - image: "${REGISTRY}/azimuth_app:${FRONTEND_VERSION}" + image: "${REGISTRY}/azimuth-app:${FRONTEND_VERSION}" command: - node - ./server.js diff --git a/docs/Makefile b/docs/Makefile index a13f0b65..a3857699 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,6 +1,6 @@ # Minimal makefile for Sphinx documentation # -REGISTRY = azimuth +REGISTRY = servicenowdocker IMAGE = azimuth_docs # Put it first so that "make" without argument is like "make help". diff --git a/makefiles/Makefile.test b/makefiles/Makefile.test index 904e4467..fe6c74be 100644 --- a/makefiles/Makefile.test +++ b/makefiles/Makefile.test @@ -57,10 +57,10 @@ check-changes: .PHONY: image.testbackend image.testbackend: - docker run --rm -t $(REGISTRY)/$(IMAGE)_$(DEVICE):$(TAG)$(TAG_EXT) make test + docker run --rm -t $(REGISTRY)/$(IMAGE):$(TAG)_$(DEVICE)$(TAG_EXT) make test .PHONY: image.testfrontend image.testfrontend: docker run --rm \ - -t ${REGISTRY}/azimuth_app:$(TAG)$(TAG_EXT) \ + -t ${REGISTRY}/azimuth-app:$(TAG)$(TAG_EXT) \ make test