Switch from docker-compose to docker compose, remove travis

Makefile

@@ -29,16 +29,16 @@ help: ## This colourful help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-.]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 .docker-compose-build.yml: $(docker_compose_configs)
-	docker-compose $(foreach dc,$^,-f $(dc)) config >$@
+	docker compose $(foreach dc,$^,-f $(dc)) config >$@
 
 .PHONY: build
 build: .docker-compose-build.yml ## Builds all images (uses cache)
 	# building $$(PROJECTS)
-	docker-compose -f $< build --parallel
+	docker compose -f $< build --parallel
 
 .PHONY: build-nc
 build-nc: .docker-compose-build.yml ## Builds all images from scratch
-	docker-compose -f $< build --parallel --no-cache
+	docker compose -f $< build --parallel --no-cache
 
 .PHONY: devenv
 devenv: .venv ##  Nuilds python environment and installs some tooling for operations
@@ -51,3 +51,17 @@ devenv: .venv ##  Nuilds python environment and installs some tooling for operat
 clean: ## Cleans all unversioned files in project
 	@echo -n "Are you sure? [y/N] " && read ans && [ $${ans:-N} = y ]
 	@git clean -dxf
+
+.PHONY: info-tools
+info-tools: ## displays tools versions
+	@echo dev-tools versions -------------------------
+	@echo ' awk           : $(shell awk -W version 2>&1 | head -n 1)'
+	@echo ' docker        : $(shell docker --version)'
+	@echo ' docker buildx : $(shell docker buildx version)'
+	@echo ' docker compose: $(shell docker compose version)'
+	@echo ' jq            : $(shell jq --version)'
+	@echo ' make          : $(shell make --version 2>&1 | head -n 1)'
+	@echo ' node          : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
+	@echo ' python        : $(shell python3 --version)'
+	@echo ' uv            : $(shell uv --version 2> /dev/null || echo ERROR uv missing)'
+	@echo ' ubuntu        : $(shell lsb_release --description --short 2> /dev/null | tail || echo ERROR Not an Ubuntu OS )'

devpi/Makefile

@@ -36,21 +36,21 @@ help: ## This help.
 .PHONY: build build-nc
 
 build:  ## Build the container
-	docker-compose build $(APP_NAME) 
+	docker compose build $(APP_NAME) 
 
 build-nc:  ## Build the container without caching
-	docker-compose build --no-cache $(APP_NAME)
+	docker compose build --no-cache $(APP_NAME)
 
 .PHONY: test
 test: .check_version ## Run the tests 
 	@echo "We don't have test here yet"
 
 .PHONY: up  down
 up: ## Launch the container
-	docker-compose up
+	docker compose up
 
 down: ## Stop the container
-	docker-compose down
+	docker compose down
 
 # Docker tagging
 .PHONY: tag 
@@ -88,8 +88,8 @@ clean: .check_clean ## Cleans unversioned files/foldersm remove all temporary fo
 	@git clean -Xdf
 	# removes all temporary folders
 	@-rm -rf $(wildcard $(TMPPREFIX)*)
-	# cleans close docker-compose
-	@-docker-compose down
+	# cleans close docker compose
+	@-docker compose down
 
 clean-images: .check_clean ## Remove all images concerning the current app
 	$(shell docker rmi -f $$(docker images |grep $(DOCKER_IMAGE_NAME)))

devpi/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   devpi:
     image: ${DOCKER_REPO}/devpi:${VERSION:-latest}
@@ -26,4 +25,4 @@ services:
       DEVPISERVER_DEVPI_USER_TEMPLATE: uid={username},ou=users,dc=example,dc=com
       DEVPISERVER_DEVPI_GROUP_SEARCH_BASE: ou=groups,dc=example,dc=com
       DEVPISERVER_DEVPI_GROUP_FILTER: (&(objectClass=posixGroup)(memberUid={username}))
-      DEVPISERVER_DEVPI_GROUP_ATTRIBUTE_NAME: uid
+      DEVPISERVER_DEVPI_GROUP_ATTRIBUTE_NAME: uid

example-config/Makefile

@@ -30,21 +30,21 @@ help: ## This help.
 .PHONY: build build-nc
 
 build:  ## Build the container
-	docker-compose build $(APP_NAME) 
+	docker compose build $(APP_NAME) 
 
 build-nc:  ## Build the container without caching
-	docker-compose build --no-cache $(APP_NAME)
+	docker compose build --no-cache $(APP_NAME)
 
 .PHONY: test
 test: .check_version ## Run the tests 
 	@echo "We don't have test here yet"
 
 .PHONY: up  down
 up: ## Launch the container
-	docker-compose up
+	docker compose up
 
 down: ## Stop the container
-	docker-compose down
+	docker compose down
 
 # Docker tagging
 .PHONY: tag 
@@ -82,8 +82,8 @@ clean: .check_clean ## Cleans unversioned files/foldersm remove all temporary fo
 	@git clean -Xdf
 	# removes all temporary folders
 	@-rm -rf $(wildcard $(TMPPREFIX)*)
-	# cleans close docker-compose
-	@-docker-compose down
+	# cleans close docker compose
+	@-docker compose down
 
 clean-images: .check_clean ## Remove all images concerning the current app
 	$(shell docker rmi -f $$(docker images |grep $(DOCKER_IMAGE_NAME)))

example-config/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   devpi:
     image: ${DOCKER_REPO}/example-config:${VERSION:-latest} # TODO Change example-config by the name of your project
@@ -10,4 +9,4 @@ services:
         org.label-schema.schema-version: "1.0"
         org.label-schema.build-date: "${BUILD_DATE}"
         org.label-schema.vcs-url: "${VCS_URL}"
-        org.label-schema.vcs-ref: "${VCS_REF}"
+        org.label-schema.vcs-ref: "${VCS_REF}"

pip-kit/README.md

@@ -31,7 +31,7 @@ echo pip-tools > requirements.in
 
 docker -it -v $(pwd):/home/itis/work itisfoundation/pip-kit pip-compile requirements.in
 # OR
-docker-compose run pip-kit pip-compile requirements.in
+docker compose run pip-kit pip-compile requirements.in
 ```
 
 <!--REFERENCES. Please keep alphabetical order -->