From 26c56e259b3cfc10df101efcb04cd8e8ba18eee8 Mon Sep 17 00:00:00 2001
From: m-guberina <gubi.guberina@gmail.com>
Date: Tue, 5 Nov 2024 14:11:36 +0100
Subject: [PATCH] adding --format docker hopefully fixes the podman build issue
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e683981..9929ce2 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 d86042d..8b26f81 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
--
GitLab