From 9a54bc8bb65d32d30005d1237d80981b1995713a Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:31:19 +0100 Subject: [PATCH 01/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 45 ++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index f9fbce4..7ce8360 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -2,9 +2,9 @@ name: Docker Build on: push: - branches: [ main, master ] # Adjust based on your primary branch name + branches: [ main, devel ] # Adjust based on your primary branch name pull_request: - branches: [ main, master ] + branches: [ main, devel ] jobs: build: @@ -13,7 +13,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Print Docker and Docker Compose versions run: | echo "Docker version:" @@ -22,10 +24,23 @@ jobs: docker compose version echo "System info:" uname -a + - name: Free up disk space + run: | + echo "Disk space before cleanup:" + df -h - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - + # Remove unnecessary large packages + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + sudo rm -rf /opt/ghc + sudo rm -rf /opt/hostedtoolcache + + # Clean apt cache + sudo apt clean + sudo apt autoremove --yes + + echo "Disk space after cleanup:" + df -h - name: List files in directory run: | echo "Repository contents:" @@ -33,16 +48,16 @@ jobs: echo "Docker-related files:" find . -name "Dockerfile" -o -name "docker-compose.yml" -o -name "docker-compose.yaml" - - name: Build with Docker Compose - run: | - echo "Starting Docker Compose build..." - docker compose build --progress=plain - echo "Docker Compose build completed successfully!" + # - name: Build with Docker Compose + # run: | + # echo "Starting Docker Compose build..." + # docker compose build --progress=plain + # echo "Docker Compose build completed successfully!" - - name: List built images - run: | - echo "Built Docker images:" - docker images + # - name: List built images + # run: | + # echo "Built Docker images:" + # docker images # Optional - Add a test step that runs your container # - name: Test container From 201d87e7b34ea1a95d0b228c0e4459a0c52b8e34 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:34:23 +0100 Subject: [PATCH 02/12] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e9c19c7..e2a2a8c 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,11 @@ Project Website , Paper (arXiv)

-[![Docker Build](https://github.com/KTH-RPL/OneMap/actions/workflows/docker-build.yml/badge.svg)](https://github.com/KTH-RPL/OneMap/actions/workflows/docker-build.yml) - +

+ + Docker Build + +

This repository contains the code for the paper "One Map to Find Them All: Real-time Open-Vocabulary Mapping for Zero-shot Multi-Object Navigation". We provide a [dockerized environment](#setup-docker) to run the code or From 0a94b706a077304ca20daedcf38c7f61296f4ae9 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:35:20 +0100 Subject: [PATCH 03/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7ce8360..a2b6bc6 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -48,16 +48,16 @@ jobs: echo "Docker-related files:" find . -name "Dockerfile" -o -name "docker-compose.yml" -o -name "docker-compose.yaml" - # - name: Build with Docker Compose - # run: | - # echo "Starting Docker Compose build..." - # docker compose build --progress=plain - # echo "Docker Compose build completed successfully!" + - name: Build with Docker Compose + run: | + echo "Starting Docker Compose build..." + docker compose build --progress=plain + echo "Docker Compose build completed successfully!" - # - name: List built images - # run: | - # echo "Built Docker images:" - # docker images + - name: List built images + run: | + echo "Built Docker images:" + docker images # Optional - Add a test step that runs your container # - name: Test container From ca792d21480efbc91f9e104587486049e78d412f Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:09:42 +0100 Subject: [PATCH 04/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a2b6bc6..6a2a474 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -34,10 +34,13 @@ jobs: sudo rm -rf /usr/local/lib/android sudo rm -rf /opt/ghc sudo rm -rf /opt/hostedtoolcache - - # Clean apt cache - sudo apt clean - sudo apt autoremove --yes + sudo apt-get remove -y '^ghc-8.*' + sudo apt-get remove -y '^dotnet-.*' + sudo apt-get remove -y '^llvm-.*' + sudo apt-get remove -y 'php.*' + sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel + sudo apt-get autoremove -y + sudo apt-get clean echo "Disk space after cleanup:" df -h From 70a4920dada2d4b8c6054a6d3990309db32adabe Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:10:16 +0100 Subject: [PATCH 05/12] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 7acf22a..ddb863b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ RUN apt update && apt install -y --no-install-recommends \ python-is-python3\ libjpeg-dev libglm-dev libgl1-mesa-glx libegl1-mesa-dev mesa-utils xorg-dev freeglut3-dev \ unzip &&\ + apt-get clean all &&\ rm -rf /var/lib/apt/lists/* # # From 571d6e3bd764012178aca76c37caa8fe75e5a7c5 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:13:05 +0100 Subject: [PATCH 06/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6a2a474..5f09dad 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -34,11 +34,6 @@ jobs: sudo rm -rf /usr/local/lib/android sudo rm -rf /opt/ghc sudo rm -rf /opt/hostedtoolcache - sudo apt-get remove -y '^ghc-8.*' - sudo apt-get remove -y '^dotnet-.*' - sudo apt-get remove -y '^llvm-.*' - sudo apt-get remove -y 'php.*' - sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel sudo apt-get autoremove -y sudo apt-get clean From 566c13b8876c2c19fd65c8db5640415f9b3c4b2c Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:19:44 +0100 Subject: [PATCH 07/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 5f09dad..c23adba 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -34,6 +34,7 @@ jobs: sudo rm -rf /usr/local/lib/android sudo rm -rf /opt/ghc sudo rm -rf /opt/hostedtoolcache + sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo apt-get autoremove -y sudo apt-get clean From 13b00a9c594a558bad4a6b1c4685192ef3a2bb14 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:21:29 +0100 Subject: [PATCH 08/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c23adba..ba9ce9b 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -37,7 +37,32 @@ jobs: sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo apt-get autoremove -y sudo apt-get clean - + sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true + sudo rm -rf \ + /usr/share/dotnet /usr/local/lib/android /opt/ghc \ + /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \ + /usr/lib/jvm || true + echo "some directories deleted" + sudo apt install aptitude -y >/dev/null 2>&1 + sudo aptitude purge aria2 ansible azure-cli shellcheck rpm xorriso zsync \ + esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable \ + google-cloud-sdk imagemagick \ + libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \ + mercurial apt-transport-https mono-complete libmysqlclient \ + unixodbc-dev yarn chrpath libssl-dev libxft-dev \ + libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev \ + snmp pollinate libpq-dev postgresql-client powershell ruby-full \ + sphinxsearch subversion mongodb-org azure-cli microsoft-edge-stable \ + -y -f >/dev/null 2>&1 + sudo aptitude purge google-cloud-sdk -f -y >/dev/null 2>&1 + sudo aptitude purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true + sudo apt purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true + sudo aptitude purge '~n ^mysql' -f -y >/dev/null 2>&1 + sudo aptitude purge '~n ^php' -f -y >/dev/null 2>&1 + sudo aptitude purge '~n ^dotnet' -f -y >/dev/null 2>&1 + sudo apt-get autoremove -y >/dev/null 2>&1 + sudo apt-get autoclean -y >/dev/null 2>&1 + echo "some packages purged" echo "Disk space after cleanup:" df -h - name: List files in directory From 060fdb8656e495f5e6be1919ab75f6dc8d4bc7f3 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:33:07 +0100 Subject: [PATCH 09/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index ba9ce9b..722778e 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -28,7 +28,6 @@ jobs: run: | echo "Disk space before cleanup:" df -h - # Remove unnecessary large packages sudo rm -rf /usr/share/dotnet sudo rm -rf /usr/local/lib/android @@ -37,32 +36,9 @@ jobs: sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo apt-get autoremove -y sudo apt-get clean - sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true - sudo rm -rf \ - /usr/share/dotnet /usr/local/lib/android /opt/ghc \ - /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \ - /usr/lib/jvm || true - echo "some directories deleted" - sudo apt install aptitude -y >/dev/null 2>&1 - sudo aptitude purge aria2 ansible azure-cli shellcheck rpm xorriso zsync \ - esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable \ - google-cloud-sdk imagemagick \ - libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \ - mercurial apt-transport-https mono-complete libmysqlclient \ - unixodbc-dev yarn chrpath libssl-dev libxft-dev \ - libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev \ - snmp pollinate libpq-dev postgresql-client powershell ruby-full \ - sphinxsearch subversion mongodb-org azure-cli microsoft-edge-stable \ - -y -f >/dev/null 2>&1 - sudo aptitude purge google-cloud-sdk -f -y >/dev/null 2>&1 - sudo aptitude purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true - sudo apt purge microsoft-edge-stable -f -y >/dev/null 2>&1 || true - sudo aptitude purge '~n ^mysql' -f -y >/dev/null 2>&1 - sudo aptitude purge '~n ^php' -f -y >/dev/null 2>&1 - sudo aptitude purge '~n ^dotnet' -f -y >/dev/null 2>&1 - sudo apt-get autoremove -y >/dev/null 2>&1 - sudo apt-get autoclean -y >/dev/null 2>&1 - echo "some packages purged" + sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true + sudo docker image prune --all --force + sudo docker builder prune -a echo "Disk space after cleanup:" df -h - name: List files in directory From ad7e84c9d5c10118252609654638086e4fc8af50 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:35:16 +0100 Subject: [PATCH 10/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 722778e..8f6b42f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code From ae5e0b43e6bc7e641268352e77e20cfc4f898572 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:41:16 +0100 Subject: [PATCH 11/12] Update docker-build.yml Make use of extra drive --- .github/workflows/docker-build.yml | 52 ++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8f6b42f..3ffe3a4 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,11 +1,9 @@ name: Docker Build - on: push: - branches: [ main, devel ] # Adjust based on your primary branch name + branches: [ main, devel ] pull_request: branches: [ main, devel ] - jobs: build: runs-on: ubuntu-22.04 @@ -14,8 +12,32 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + - name: Configure Docker to use extra disk space + run: | + echo "Disk space before reconfiguration:" + df -h + + # Stop Docker service + sudo systemctl stop docker + + # Create new Docker data directory on the secondary disk + sudo mkdir -p /mnt/docker + + # Configure Docker to use the new location + echo '{ + "data-root": "/mnt/docker" + }' | sudo tee /etc/docker/daemon.json + + # Restart Docker service + sudo systemctl start docker + sudo systemctl status docker + + echo "Disk space after reconfiguration:" + df -h + - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v2 + - name: Print Docker and Docker Compose versions run: | echo "Docker version:" @@ -24,6 +46,7 @@ jobs: docker compose version echo "System info:" uname -a + - name: Free up disk space run: | echo "Disk space before cleanup:" @@ -36,11 +59,9 @@ jobs: sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo apt-get autoremove -y sudo apt-get clean - sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true - sudo docker image prune --all --force - sudo docker builder prune -a echo "Disk space after cleanup:" df -h + - name: List files in directory run: | echo "Repository contents:" @@ -50,20 +71,17 @@ jobs: - name: Build with Docker Compose run: | + # Create a temporary directory on the secondary disk for any build artifacts + mkdir -p /mnt/build-tmp + echo "Starting Docker Compose build..." - docker compose build --progress=plain + # Use DOCKER_BUILDKIT=1 for more efficient builds + DOCKER_BUILDKIT=1 docker compose build --progress=plain echo "Docker Compose build completed successfully!" - name: List built images run: | echo "Built Docker images:" docker images - - # Optional - Add a test step that runs your container - # - name: Test container - # run: | - # docker compose up -d - # echo "Container is running. Docker status:" - # docker ps - # # Add any test commands here - # docker compose down + echo "Disk usage:" + df -h From 6b95952ee6e7f0e676cdd23e53ff83fff76b8cb7 Mon Sep 17 00:00:00 2001 From: Finn Busch <57601738+finnBsch@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:45:05 +0100 Subject: [PATCH 12/12] Update docker-build.yml --- .github/workflows/docker-build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3ffe3a4..8d9d88a 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -52,13 +52,13 @@ jobs: echo "Disk space before cleanup:" df -h # Remove unnecessary large packages - sudo rm -rf /usr/share/dotnet - sudo rm -rf /usr/local/lib/android - sudo rm -rf /opt/ghc - sudo rm -rf /opt/hostedtoolcache - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - sudo apt-get autoremove -y - sudo apt-get clean + # sudo rm -rf /usr/share/dotnet + # sudo rm -rf /usr/local/lib/android + # sudo rm -rf /opt/ghc + # sudo rm -rf /opt/hostedtoolcache + # sudo rm -rf "$AGENT_TOOLSDIRECTORY" + # sudo apt-get autoremove -y + # sudo apt-get clean echo "Disk space after cleanup:" df -h @@ -72,7 +72,8 @@ jobs: - name: Build with Docker Compose run: | # Create a temporary directory on the secondary disk for any build artifacts - mkdir -p /mnt/build-tmp + sudo mkdir -p /mnt/build-tmp + sudo chown $USER:$USER /mnt/build-tmp echo "Starting Docker Compose build..." # Use DOCKER_BUILDKIT=1 for more efficient builds