From 5d7e9efdb0a03aa4cb0557e2f29eb8fe42fa5ea3 Mon Sep 17 00:00:00 2001 From: macmacal Date: Mon, 15 Dec 2025 14:26:33 +0100 Subject: [PATCH 1/2] DEL: Moved hosting services to new repo --- README.md | 41 ------------- utils/aegis_packages/Dockerfile | 7 --- utils/aegis_packages/README.md | 40 ------------- utils/aegis_packages/docker-compose.yml | 10 ---- .../aegis_packages/packages/DEB_PACKAGES_HERE | 1 - utils/containers_registry/README.md | 60 ------------------- utils/containers_registry/docker-compose.yml | 10 ---- 7 files changed, 169 deletions(-) delete mode 100644 utils/aegis_packages/Dockerfile delete mode 100644 utils/aegis_packages/README.md delete mode 100644 utils/aegis_packages/docker-compose.yml delete mode 100644 utils/aegis_packages/packages/DEB_PACKAGES_HERE delete mode 100644 utils/containers_registry/README.md delete mode 100644 utils/containers_registry/docker-compose.yml diff --git a/README.md b/README.md index 717905b..dd447ed 100644 --- a/README.md +++ b/README.md @@ -37,47 +37,6 @@ toolbox enter aegis_dev-latest --- -### Private Packages Repo (PPA) - -How to Set up private repo [here](./utils/aegis_packages/README.md). - -**Adding private repo** -```bash -echo "deb [trusted=yes] http://192.168.0.100/debian ./" | tee -a /etc/apt/sources.list > /dev/null -``` -### Containers registry - -[Instructions how to use self-hosted container registry.](./utils/containers_registry/README.md) - -#### Building & pushing a particular release tag -```bash -export REGISTRY_HOSTNAME=geonosis:5000 -export AEGIS_ROS_VERSION= -export AEGIS_CONTAINER_VERSION= - -# if the building is happening on the same machine as PPA server, add argument: -# --add-host $(hostname):$(hostname -I | awk '{print $1}') -podman build . -t ceai/aegis_dev:${AEGIS_CONTAINER_VERSION} --build-arg AEGIS_ROS_TAG=${AEGIS_ROS_VERSION} -podman tag ceai/aegis_dev:${AEGIS_CONTAINER_VERSION} ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} -podman image inspect --format='{{json .Config.Labels}}' ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} - -podman push ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} -``` - -#### Pulling & entering a particular release tag -```bash -export REGISTRY_HOSTNAME=geonosis:5000 -export AEGIS_CONTAINER_VERSION= - -podman pull ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} -podman image inspect --format='{{json .Config.Labels}}' ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} - -toolbox create --image ${REGISTRY_HOSTNAME}/ceai/aegis:${AEGIS_CONTAINER_VERSION} -toolbox enter aegis-${AEGIS_CONTAINER_VERSION} -``` - ---- - ### Known issues: ##### `sudo`: unable to resolve host `toolbox` / `toolbx` diff --git a/utils/aegis_packages/Dockerfile b/utils/aegis_packages/Dockerfile deleted file mode 100644 index 4cee16c..0000000 --- a/utils/aegis_packages/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM ubuntu:latest - -RUN apt-get update && \ - apt-get install -y \ - apache2 - -CMD ["apachectl", "-D", "FOREGROUND"] diff --git a/utils/aegis_packages/README.md b/utils/aegis_packages/README.md deleted file mode 100644 index 8912f57..0000000 --- a/utils/aegis_packages/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# Private Packages Repo (PPA) - -This module enables storing private *.deb packages used for automated container built. - -More [here](https://linuxconfig.org/easy-way-to-create-a-debian-package-and-local-package-repository). - -## Preparing packages - -**Copy packages:** - -Copy all `*.deb` packages into the `./packages` directory. - -**Generate package list:** - -* After moving all packages to the `./packages` directory, you need to generate the **package list**. -* On a Debian-based system (e.g., Ubuntu), run the following command inside the `./packages` directory. - * There is **no need** to run this inside the container. -```bash -dpkg-scanpackages . | gzip -c9 > Packages.gz -``` -or -```bash -sudo sh -c 'dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz' -``` - -* Done! The PPA server is now ready to serve packages. - -## Running Server - -**Docker Compose**: -```bash -docker compose up -d -``` - -### Adding new packages - -Follow `Preparing packages` step and the list of packages will automatically update. - ---- -[Back to main README](../../README.md) diff --git a/utils/aegis_packages/docker-compose.yml b/utils/aegis_packages/docker-compose.yml deleted file mode 100644 index 295e6cb..0000000 --- a/utils/aegis_packages/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - aegis-packages: - build: - context: . - dockerfile: "${DOCKERFILE:-Dockerfile}" - ports: - - 80:80 - restart: always - volumes: - - ./packages:/var/www/html/debian diff --git a/utils/aegis_packages/packages/DEB_PACKAGES_HERE b/utils/aegis_packages/packages/DEB_PACKAGES_HERE deleted file mode 100644 index 7c5f8c7..0000000 --- a/utils/aegis_packages/packages/DEB_PACKAGES_HERE +++ /dev/null @@ -1 +0,0 @@ -## Place here all *.deb packages you want to be installed. diff --git a/utils/containers_registry/README.md b/utils/containers_registry/README.md deleted file mode 100644 index 035e22d..0000000 --- a/utils/containers_registry/README.md +++ /dev/null @@ -1,60 +0,0 @@ -# Containers registry - -This service allows to self-host container registry for Podman/Docker. - -Based on [this](https://infotechys.com/host-your-own-podman-registry/) tutorial. - - -## Prepare the host -```bash -export REGISTRY_PATH=/var/lib/registry -sudo mkdir -p $REGISTRY_PATH -``` - -## Run the service -```bash -podman-compose up -d -# or -docker compose up -d -``` - -## Setup the clients -The easiest way is to provide the registry address manually: -```bash -sudo vim /etc/containers/registries.conf -``` - -Assuming that `HOSTNAME` is your host IP address: -``` -[[registry]] -location = "HOSTNAME:5000" -insecure = true -``` - -> [!WARNING] -> This configuration is NOT SAFE. Consider setting up proper SSL certificates before running on your machine. - -Restart the contenerization engine: -```bash -sudo systemctl restart podman -# or -sudo systemctl restart docker -``` - -## Use it - -### Push -```bash -podman images -podman tag localhost/example:latest HOSTNAME:5000/example:latest -podman push HOSTNAME:5000/example:latest -``` - -### Pull -```bash -podman pull HOSTNAME:5000/example:latest -podman images -``` - ---- -[Back to main README](../../README.md) diff --git a/utils/containers_registry/docker-compose.yml b/utils/containers_registry/docker-compose.yml deleted file mode 100644 index c739cb1..0000000 --- a/utils/containers_registry/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - containers_registry: - image: docker.io/library/registry:2 - container_name: containers_registry - privileged: true - restart: always - ports: - - "5000:5000" - volumes: - - ./registry:/var/lib/registry From 088abfa3782a9f6b5695d7f4c21aa3b963ea113a Mon Sep 17 00:00:00 2001 From: macmacal Date: Mon, 15 Dec 2025 14:28:45 +0100 Subject: [PATCH 2/2] CHG: updated pre-commit --- .pre-commit-config.yaml | 45 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a223d7e..1aede00 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,25 +1,30 @@ repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 +- repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update + rev: v0.9.0 hooks: - - id: check-added-large-files - - id: check-case-conflict - - id: check-json - - id: check-merge-conflict - - id: check-symlinks - - id: check-toml - - id: check-xml - - id: check-yaml - - id: debug-statements - - id: destroyed-symlinks - - id: detect-private-key - - id: end-of-file-fixer - - id: mixed-line-ending - - id: pretty-format-json - - id: trailing-whitespace + - id: pre-commit-update - - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v6.0.0 hooks: - - id: codespell + - id: check-added-large-files + - id: check-case-conflict + - id: check-json + - id: check-merge-conflict + - id: check-symlinks + - id: check-toml + - id: check-xml + - id: check-yaml + - id: debug-statements + - id: destroyed-symlinks + - id: detect-private-key + - id: end-of-file-fixer + - id: mixed-line-ending + - id: pretty-format-json + - id: trailing-whitespace + +- repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell args: [-L, passt, -w]