diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e683981eddee66551aa973425f4f72df69797e6a..9929ce232b95d24c597ffccc2eaa8837e1d04d67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ podman-build: stage: build script: - podman login -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" "$DOCKER_REGISTRY" - - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - podman build --format docker -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - | if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then diff --git a/Dockerfile b/Dockerfile index d86042d07d4390221317d6099df115e6b20a01fa..8b26f81b1e12a1c76820333a855dfe2999227b63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,6 @@ SHELL ["/bin/bash", "--login", "-c"] # this is enough to run clik WORKDIR /home/student/ USER student -RUN pip install -e ./SimpleManipulatorControl/python/ # TODO: install casadi and pinochio 3.0+ # TODO: verify this stuff below works # --> this can be done with conda @@ -71,9 +70,10 @@ RUN bash /home/student/miniconda3/miniconda.sh -b -u -p ~/miniconda3 RUN rm /home/student/miniconda3/miniconda.sh ENV PATH=/home/student/miniconda3/bin:$PATH RUN source /home/student/miniconda3/bin/activate +RUN pip install -e ./SimpleManipulatorControl/python/ RUN conda config --add channels conda-forge #RUN conda install --solver=classic conda-forge::conda-libmamba-solver conda-forge::libmamba conda-forge::libmambapy conda-forge::libarchive RUN conda install -y casadi RUN conda install -y pinocchio -c conda-forge RUN pip install matplotlib meshcat ur_rtde \ - qpsolvers ecos casadi example_robot_data + qpsolvers ecos example_robot_data meshcat_shapes