Skip to content

Commit

Permalink
Update docker image
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
  • Loading branch information
ajtudela committed May 23, 2024
1 parent 048f4c8 commit 1e269e0
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/components_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/components_execution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/components_generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/robocomp_tools_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/robocompdsl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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
Expand Down
Empty file modified scripts/install/robocomp_install.sh
100644 → 100755
Empty file.

0 comments on commit 1e269e0

Please sign in to comment.