From 1e269e05f7b0a9879a1b79bf0707df05956d72be Mon Sep 17 00:00:00 2001 From: Alberto Tudela Date: Thu, 23 May 2024 21:04:52 +0200 Subject: [PATCH] Update docker image Signed-off-by: Alberto Tudela --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/components_compilation.yml | 6 +++--- .github/workflows/components_execution.yml | 4 ++-- .github/workflows/components_generation.yml | 4 ++-- .github/workflows/robocomp_tools_check.yml | 6 +++--- .github/workflows/robocompdsl.yml | 6 +++--- docker/Dockerfile | 4 ++-- scripts/install/robocomp_install.sh | 0 8 files changed, 16 insertions(+), 16 deletions(-) mode change 100644 => 100755 scripts/install/robocomp_install.sh diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 946c2d367..4d6400100 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -72,7 +72,7 @@ jobs: run: cmake -E make_directory ${{github.workspace}}/build - name: Robocomp dependencies install - run: curl -sL https://raw.githubusercontent.com/robocomp/robocomp/${{ steps.branch-name.outputs.current_branch }}/tools/install/resources/robocomp_prerequisites_install.sh | bash + run: curl -sL https://raw.githubusercontent.com/grupo-avispa/robocomp/${{ steps.branch-name.outputs.current_branch }}/tools/install/resources/robocomp_prerequisites_install.sh | bash - name: Robocomp tools install shell: bash diff --git a/.github/workflows/components_compilation.yml b/.github/workflows/components_compilation.yml index 810564af8..b7234d9e6 100644 --- a/.github/workflows/components_compilation.yml +++ b/.github/workflows/components_compilation.yml @@ -15,11 +15,11 @@ jobs: make-compilation-test: runs-on: ubuntu-latest container: - image: "robocomp/robocomp:development__dsr__latest" - options: --user robolab + image: "grupo-avispa/robocomp:development__dsr__latest" + options: --user demo steps: - - run: "cd /home/robolab/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && python3 test_component_generation.py --no-execution --avoid agmTestCp" + - run: "cd /home/demo/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && python3 test_component_generation.py --no-execution --avoid agmTestCp" fail-on-image-fail: runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'failure' }} diff --git a/.github/workflows/components_execution.yml b/.github/workflows/components_execution.yml index 163aa0bfb..4011809e3 100644 --- a/.github/workflows/components_execution.yml +++ b/.github/workflows/components_execution.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest container: image: "robocomp/robocomp:development__dsr__latest" - options: --user robolab + options: --user demo steps: - - run: "cd /home/robolab/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && (rcnode &) ; python3 test_component_generation.py -d --avoid test_dsr2Python test_dsr2Cpp test_agmTestCpp" + - run: "cd /home/demo/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && (rcnode &) ; python3 test_component_generation.py -d --avoid test_dsr2Python test_dsr2Cpp test_agmTestCpp" fail-on-image-fail: runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'failure' }} diff --git a/.github/workflows/components_generation.yml b/.github/workflows/components_generation.yml index 17ae720f4..225585c54 100644 --- a/.github/workflows/components_generation.yml +++ b/.github/workflows/components_generation.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest container: image: "robocomp/robocomp:development__dsr__latest" - options: --user robolab + options: --user demo steps: - - run: "cd /home/robolab/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && python3 test_component_generation.py -g" + - run: "cd /home/demo/robocomp/tools/cli/robocompdsl/test/autogeneration_tests/test_cdsl/ && python3 test_component_generation.py -g" fail-on-image-fail: runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'failure' }} diff --git a/.github/workflows/robocomp_tools_check.yml b/.github/workflows/robocomp_tools_check.yml index 0df8529ef..af571cc92 100644 --- a/.github/workflows/robocomp_tools_check.yml +++ b/.github/workflows/robocomp_tools_check.yml @@ -16,12 +16,12 @@ jobs: runs-on: ubuntu-latest container: image: "robocomp/robocomp:development__dsr__latest" - options: --user robolab + options: --user demo steps: - name: Robocomp tools install shell: bash - working-directory: /home/robolab/robocomp/tools/cli/ + working-directory: /home/demo/robocomp/tools/cli/ run: sudo pip3 install . - run: "robocomp --help" - run: "rcworkspace --help" @@ -32,7 +32,7 @@ jobs: - run: "robocompdsl --help" - name: Yaku install shell: bash - working-directory: /home/robolab/robocomp/tools/yaku/ + working-directory: /home/demo/robocomp/tools/yaku/ run: sudo pip3 install . - run: "yaku --help" fail-on-image-fail: diff --git a/.github/workflows/robocompdsl.yml b/.github/workflows/robocompdsl.yml index 025ab1fa0..1db7151b6 100644 --- a/.github/workflows/robocompdsl.yml +++ b/.github/workflows/robocompdsl.yml @@ -15,11 +15,11 @@ jobs: robocomp-dsl-test: runs-on: ubuntu-latest container: - image: "robocomp/robocomp:development__dsr__latest" - options: --user robolab + image: "grupo-avispa/robocomp:development__dsr__latest" + options: --user demo steps: - - run: "cd /home/robolab/robocomp/tools/cli/robocompdsl/test/ && python3 -m unittest discover -p 'test_*.py'" + - run: "cd /home/demo/robocomp/tools/cli/robocompdsl/test/ && python3 -m unittest discover -p 'test_*.py'" fail-on-image-fail: runs-on: ubuntu-latest if: ${{ github.event.workflow_run.conclusion == 'failure' }} diff --git a/docker/Dockerfile b/docker/Dockerfile index 4079b0eec..1711b89bd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ sudo \ && rm -rf /var/lib/apt/lists/* RUN cd ~ && export branch=$branch \ - && curl -sL https://raw.githubusercontent.com/robocomp/robocomp/$branch/tools/install/resources/robocomp_prerequisites_install.sh | bash -s $branch + && curl -sL https://raw.githubusercontent.com/grupo-avispa/robocomp/$branch/tools/install/resources/robocomp_prerequisites_install.sh | bash -s $branch RUN export uid=1000 gid=1000 && \ mkdir -p /home/demo && \ echo "demo:x:${uid}:${gid}:demo,,,:/home/demo:/bin/bash" >> /etc/passwd && \ @@ -32,7 +32,7 @@ FROM dependencies-version AS base-version ARG branch # Using robocomp installation script RUN cd ~ && export branch=$branch \ - && curl -sL https://raw.githubusercontent.com/robocomp/robocomp/$branch/tools/install/robocomp_install.sh | bash -s $branch + && curl -sL https://raw.githubusercontent.com/grupo-avispa/robocomp/$branch/tools/install/robocomp_install.sh | bash -s $branch ENV PATH=$PATH:/opt/robocomp/bin/:'/home/demo/.local/bin' ENV ROBOCOMP=/home/demo/robocomp RUN export ROBOCOMP=/home/demo/robocomp diff --git a/scripts/install/robocomp_install.sh b/scripts/install/robocomp_install.sh old mode 100644 new mode 100755