Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
ur_simple_control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marko Guberina
ur_simple_control
Commits
26c56e25
Commit
26c56e25
authored
8 months ago
by
m-guberina
Browse files
Options
Downloads
Patches
Plain Diff
adding --format docker hopefully fixes the podman build issue
parent
ae6eb938
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
with
3 additions
and
3 deletions
.gitlab-ci.yml
+
1
−
1
View file @
26c56e25
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
2
View file @
26c56e25
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment