diff --git a/.dockyman/Makefile b/.dockyman/Makefile index 34b93c0..7c0ee02 100644 --- a/.dockyman/Makefile +++ b/.dockyman/Makefile @@ -285,7 +285,15 @@ create_env: echo "GPU_PROFILE=no-gpu" >> ${ENV_FILE_RUN}; \ fi -build-base-nocache: remove-build-base build-base +build-base-nocache: remove-build-base + @echo + @for service in $(DOCKYMAN_BASE_SERVICES); do \ + set -e; \ + echo "Building base image from service '$$service' ..."; \ + ACTION=build_base_nocache ${DOCKYMAN_BASE_COMMAND} run $$service; \ + set +e; \ + done + $(MAKE) stop-base build-base: @echo @@ -326,7 +334,15 @@ build-local: done $(MAKE) stop-local -build-local-nocache: remove-build-local build-local +build-local-nocache: remove-build-local + @echo + @for service in $(DOCKYMAN_LOCAL_SERVICES); do \ + set -e; \ + echo "Building local image from service '$$service' ..."; \ + ACTION=build_local_nocache ${DOCKYMAN_LOCAL_COMMAND} run $$service; \ + set +e; \ + done + $(MAKE) stop-local pull: @echo @@ -378,7 +394,7 @@ init-host: build: build-base build-local @docker network prune -f -rebuild: stop build-base-nocache build-local-nocache +rebuild: stop build-base-nocache build-local stop-base: ${DOCKYMAN_BASE_COMMAND} down --remove-orphans diff --git a/.dockyman/profiles/local.yaml b/.dockyman/profiles/local.yaml index ad27a34..e947ae3 100644 --- a/.dockyman/profiles/local.yaml +++ b/.dockyman/profiles/local.yaml @@ -35,6 +35,7 @@ services: - XDG_DATA_DIRS=${XDG_DATA_DIRS:?err} - QT_X11_NO_MITSHM=1 - NO_AT_BRIDGE=1 + - LIBGL_ALWAYS_SOFTWARE=1 extends: file: gpus.yaml diff --git a/.github/workflows/CI-build.yml b/.github/workflows/CI-build.yml deleted file mode 100644 index c02bfce..0000000 --- a/.github/workflows/CI-build.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Dockyman build base image(s) - -on: - push: - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build and Docker image - run: | - make -C .dockyman build - diff --git a/.github/workflows/CI-push.yml b/.github/workflows/CI.yml similarity index 100% rename from .github/workflows/CI-push.yml rename to .github/workflows/CI.yml diff --git a/build.env b/build.env index 38ad373..75523fa 100644 --- a/build.env +++ b/build.env @@ -1,13 +1,12 @@ DOCKYMAN_VER=v1.2 REPOSITORY=iitschri PROFILE=development +RELEASE_DATE=2024.02 +VERSION=v7.9-distro_v2022.09.1-${RELEASE_DATE} -VERSION=v7.8-ng - -ICUB_DISTRO=v2022.09.1 -PYICUB_BASE_DOCKER_SRC=${REPOSITORY}/robotology-superbuild-docker:${ICUB_DISTRO} +PYICUB_BASE_DOCKER_SRC=iitschri/robotology-superbuild-docker:v2022.09.1-2024.02 PYICUB_BASE_NAME=${REPOSITORY}/pyicub-docker:${VERSION} -PYICUB_VERSION=v7.8-distro_v2022.09.1 +PYICUB_VERSION=v7.9-distro_v2022.09.1 PYICUB_FRONTEND_VERSION=v8.0-ng PYICUB_FRONTEND_BASE_NAME=${REPOSITORY}/pyicub-frontend-docker:${PYICUB_FRONTEND_VERSION} diff --git a/pyicub.env b/pyicub.env index 0b9cadd..244645c 100644 --- a/pyicub.env +++ b/pyicub.env @@ -1,5 +1,5 @@ PYICUB_LOGGING=true -PYICUB_LOGGING_PATH=/workdir/logs +PYICUB_LOGGING_PATH= #PYICUB_LOGGING_PATH=/workdir/logs PYICUB_API=true PYICUB_API_FRONTEND_PORT=9000 PYICUB_API_RESTMANAGER_HOST=localhost