diff --git a/Makefile b/Makefile index eb1c89c..d529c64 100644 --- a/Makefile +++ b/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 )' diff --git a/ci/travis/build/devpi b/ci/travis/build/devpi deleted file mode 100755 index b50fd83..0000000 --- a/ci/travis/build/devpi +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -before_install() { - bash ci/travis/helpers/install_docker_compose; - bash ci/travis/helpers/show_system_versions; - env - bash ci/travis/helpers/check_changes.sh devpi/; -} - -install() { - echo "nothing to install..." -} - -before_script() { - echo "nothing to do..." -} - -script() { - pushd devpi; make build; popd -} - -after_success() { - echo "build succeeded" - pushd devpi; make info-image; popd -} - -after_failure() { - echo "build failed" - env - docker images -} - -deploy() { - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; - pushd devpi; make release; popd -} - -# Check if the function exists (bash specific) -if declare -f "$1" > /dev/null -then - # call arguments verbatim - "$@" -else - # Show a helpful error - echo "'$1' is not a known function name" >&2 - exit 1 -fi diff --git a/ci/travis/build/rabbit-mq b/ci/travis/build/rabbit-mq deleted file mode 100644 index 66e73f1..0000000 --- a/ci/travis/build/rabbit-mq +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -before_install() { - bash ci/travis/helpers/install_docker_compose; - bash ci/travis/helpers/show_system_versions; - env - bash ci/travis/helpers/check_changes.sh rabbitmq/; -} - -install() { - echo "nothing to install..." -} - -before_script() { - echo "nothing to do..." -} - -script() { - make -C rabbitmq build -} - -after_success() { - echo "build succeeded" - make -C rabbitmq info -} - -after_failure() { - echo "build failed" - env - docker images -} - -deploy() { - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; - pushd rabbitmq; make push; popd -} - -# Check if the function exists (bash specific) -if declare -f "$1" > /dev/null -then - # call arguments verbatim - "$@" -else - # Show a helpful error - echo "'$1' is not a known function name" >&2 - exit 1 -fi diff --git a/ci/travis/docs/workflow.PNG b/ci/travis/docs/workflow.PNG deleted file mode 100644 index 1210681..0000000 Binary files a/ci/travis/docs/workflow.PNG and /dev/null differ diff --git a/ci/travis/helpers/check_changes.sh b/ci/travis/helpers/check_changes.sh deleted file mode 100755 index 2507cf2..0000000 --- a/ci/travis/helpers/check_changes.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -# -# As this repo follows the Monorepo pattern, we want to avoid that Travis make a build for every projects each time one project is updated -# This script checks if one project has been updated. Thanks to https://travis-ci.community/t/how-to-skip-jobs-based-on-the-files-changed-in-a-subdirectory/2979/11 -# - -PATH_TO_SEARCH="$1" - -# 3. Get the latest commit -LATEST_COMMIT=$(git rev-parse HEAD) - -# 4. Get the latest commit in the searched path -LATEST_COMMIT_IN_PATH=$(git log -1 --format=format:%H --full-diff $PATH_TO_SEARCH) - -if [ $LATEST_COMMIT != $LATEST_COMMIT_IN_PATH ]; then - echo "Exiting this job because code in the following path have not changed:" - echo $PATH_TO_SEARCH - exit 1 -fi - -echo "Paths have changed, the build will be deployed" -exit 0 \ No newline at end of file diff --git a/ci/travis/helpers/install_docker_compose b/ci/travis/helpers/install_docker_compose deleted file mode 100644 index 0a31d48..0000000 --- a/ci/travis/helpers/install_docker_compose +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -sudo rm /usr/local/bin/docker-compose -curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose -chmod +x docker-compose -sudo mv docker-compose /usr/local/bin diff --git a/ci/travis/helpers/show_system_versions b/ci/travis/helpers/show_system_versions deleted file mode 100644 index 2a581fa..0000000 --- a/ci/travis/helpers/show_system_versions +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -uname -a -lsb_release -a - -if command -v python; then - python --version -fi - -if command -v docker; then - docker -v -fi - -if command -v docker-compose; then - docker-compose version -fi diff --git a/ci/travis/release/devpi b/ci/travis/release/devpi deleted file mode 100644 index 56dd72d..0000000 --- a/ci/travis/release/devpi +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -before_install() { - bash ci/travis/helpers/install_docker_compose; - bash ci/travis/helpers/show_system_versions; - bash ci/travis/helpers/check_changes.sh devpi/; - env -} - -install() { - echo "nothing to install..." -} - -before_script() { - echo "nothing to do..." -} - -script() { - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; - pushd devpi; make release; popd -} - -after_success() { - echo "Release succeeded" - pushd devpi; make info-image; popd -} - -after_failure() { - echo "Release failed" - env - docker images -} - - -# Check if the function exists (bash specific) -if declare -f "$1" > /dev/null -then - # call arguments verbatim - "$@" -else - # Show a helpful error - echo "'$1' is not a known function name" >&2 - exit 1 -fi diff --git a/ci/travis/tests/devpi b/ci/travis/tests/devpi deleted file mode 100644 index 5234ae5..0000000 --- a/ci/travis/tests/devpi +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# http://redsymbol.net/articles/unofficial-bash-strict-mode/ -set -euo pipefail -IFS=$'\n\t' - -before_install() { - bash ci/travis/helpers/install_docker_compose; - bash ci/travis/helpers/show_system_versions; - bash ci/travis/helpers/check_changes.sh devpi/; - env -} - -install() { - echo "nothing to install..." -} - -before_script() { - echo "nothing to do..." -} - -script() { - pushd devpi; make test; popd -} - -after_success() { - echo "Test succeeded" - pushd devpi; make info-image; popd -} - -after_failure() { - echo "Test failed" - env - docker images -} - -# Check if the function exists (bash specific) -if declare -f "$1" > /dev/null -then - # call arguments verbatim - "$@" -else - # Show a helpful error - echo "'$1' is not a known function name" >&2 - exit 1 -fi diff --git a/devpi/Makefile b/devpi/Makefile index 3af90de..330ee5c 100644 --- a/devpi/Makefile +++ b/devpi/Makefile @@ -36,10 +36,10 @@ 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 @@ -47,10 +47,10 @@ test: .check_version ## Run the tests .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))) diff --git a/devpi/docker-compose.yml b/devpi/docker-compose.yml index ba32cba..71fdc41 100644 --- a/devpi/docker-compose.yml +++ b/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 \ No newline at end of file + DEVPISERVER_DEVPI_GROUP_ATTRIBUTE_NAME: uid diff --git a/example-config/Makefile b/example-config/Makefile index 82f0b56..c389ae0 100644 --- a/example-config/Makefile +++ b/example-config/Makefile @@ -30,10 +30,10 @@ 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 @@ -41,10 +41,10 @@ test: .check_version ## Run the tests .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))) diff --git a/example-config/docker-compose.yml b/example-config/docker-compose.yml index 9a2c7a7..7856523 100644 --- a/example-config/docker-compose.yml +++ b/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}" \ No newline at end of file + org.label-schema.vcs-ref: "${VCS_REF}" diff --git a/pip-kit/README.md b/pip-kit/README.md index cbc81e1..a908afd 100644 --- a/pip-kit/README.md +++ b/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 ``` diff --git a/qooxdoo-kit/Makefile b/qooxdoo-kit/Makefile index 31808e4..81d76a2 100644 --- a/qooxdoo-kit/Makefile +++ b/qooxdoo-kit/Makefile @@ -45,11 +45,11 @@ update-packages: ## updates dependencies and recreates package-lock.json build: package-lock.json ## Build the container export VERSION=lastbuild; \ - docker-compose -f docker-compose.build.yml build $(APP_NAME) + docker compose -f docker-compose.build.yml build $(APP_NAME) build-nc: package-lock.json ## Build the container without caching export VERSION=lastbuild; \ - docker-compose -f docker-compose.build.yml build --no-cache $(APP_NAME) + docker compose -f docker-compose.build.yml build --no-cache $(APP_NAME) # Run the container @@ -61,7 +61,7 @@ shell: ## opens shell in container cp -r tests $(TMPDIR) @export VERSION=lastbuild; \ export PROJECT_DIR=$(TMPDIR);\ - docker-compose run $(APP_NAME) + docker compose run $(APP_NAME) .PHONY: test @@ -70,7 +70,7 @@ test: ## tests cp -r tests $(TMPDIR) @export VERSION=lastbuild; export PROJECT_DIR=$(TMPDIR);\ - docker-compose run $(APP_NAME) /bin/sh ./tests/run.sh + docker compose run $(APP_NAME) /bin/sh ./tests/run.sh # Docker tagging @@ -121,8 +121,8 @@ clean: @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 .PHONY: clean-images clean-images: diff --git a/qooxdoo-kit/docker-compose.build.yml b/qooxdoo-kit/docker-compose.build.yml index 57b0799..41fc728 100644 --- a/qooxdoo-kit/docker-compose.build.yml +++ b/qooxdoo-kit/docker-compose.build.yml @@ -1,8 +1,6 @@ -version: '3.7' services: qooxdoo-kit: image: ${DOCKER_REPO:-itisfoundation}/qooxdoo-kit:${VERSION:-lastbuild} - # init: true See #11 build: context: . cache_from: @@ -14,4 +12,4 @@ services: org.label-schema.vcs-ref: "${VCS_REF}" swiss.itis.dockerfiles.qooxdoo-kit.qooxdoo-compiler-version : "${QOOXDOO_COMPILER_VERSION}" swiss.itis.dockerfiles.qooxdoo-kit.qooxdoo-framework-version : "${QOOXDOO_FRAMEWORK_VERSION}" - swiss.itis.dockerfiles.qooxdoo-kit.puppeteer-version : "${PUPPETEER_VERSION}" \ No newline at end of file + swiss.itis.dockerfiles.qooxdoo-kit.puppeteer-version : "${PUPPETEER_VERSION}" diff --git a/qooxdoo-kit/samples/simcore-integration (before)/services/client/Makefile b/qooxdoo-kit/samples/simcore-integration (before)/services/client/Makefile index d664a3d..4a1aedd 100644 --- a/qooxdoo-kit/samples/simcore-integration (before)/services/client/Makefile +++ b/qooxdoo-kit/samples/simcore-integration (before)/services/client/Makefile @@ -24,20 +24,20 @@ info: .PHONY: build-devel # target: build-devel: – Builds dev container build-devel: - export BUILD_TARGET=development; docker-compose build + export BUILD_TARGET=development; docker compose build .PHONY: build # target: build: – Builds container build: - export BUILD_TARGET=build; docker-compose build + export BUILD_TARGET=build; docker compose build docker run -it client_qx:build /bin/sh -c "ls -l build-output;cat build-output/version.txt" .PHONY: clean # target: clean: – Cleans images and current dir outputs clean: - @docker-compose down + @docker compose down @docker image rm -f client_qx:build 2> /dev/null @docker image rm -f client_qx:development 2> /dev/null @git clean -dxf ${CURDIR} @@ -47,7 +47,7 @@ clean: # target: compile: – Compiles front-end's code [dev] compile: export BUILD_TARGET=development; \ - docker-compose run --service-ports qx compile \ + docker compose run --service-ports qx compile \ --set osparc.vcsRef='"${VCS_REF}"' \ --set osparc.vcsRefClient='"${VCS_REF_CLIENT}"' \ --set osparc.vcsStatusClient='"${VCS_STATUS_CLIENT}"' \ @@ -58,4 +58,4 @@ compile: # target: serve: – Compiles, watches and serves front-end's code [dev] serve: export BUILD_TARGET=development; \ - docker-compose run --service-ports qx + docker compose run --service-ports qx