Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Development_Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Montaño Sarria, Andres Felipe
Development_Environment
Commits
10f22ec2
Commit
10f22ec2
authored
3 years ago
by
Montaño Sarria, Andres Felipe
Browse files
Options
Downloads
Patches
Plain Diff
Remove zivid packages from melodic
parent
acc479b0
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
dockerfiles/DevenvMelodic.Dockerfile
+34
-36
34 additions, 36 deletions
dockerfiles/DevenvMelodic.Dockerfile
dotfiles/system.bash
+4
-1
4 additions, 1 deletion
dotfiles/system.bash
with
38 additions
and
37 deletions
dockerfiles/DevenvMelodic.Dockerfile
+
34
−
36
View file @
10f22ec2
...
@@ -42,12 +42,12 @@ RUN apt-get -y install --no-install-recommends \
...
@@ -42,12 +42,12 @@ RUN apt-get -y install --no-install-recommends \
&&
rm
-rf
/var/lib/apt/lists/
*
&&
rm
-rf
/var/lib/apt/lists/
*
# Install docker-ce
# Install docker-ce
RUN
curl
-fsSL
https://download.docker.com/linux/ubuntu/gpg | apt-key add -
#
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
RUN
add-apt-repository
\
#
RUN add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu
$(
lsb_release
-cs
)
stable"
#
"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
RUN
apt-get update
&&
apt-get
-y
install
--no-install-recommends
\
#
RUN apt-get update && apt-get -y install --no-install-recommends \
docker-ce-cli
\
#
docker-ce-cli \
&&
rm
-rf
/var/lib/apt/lists/
*
#
&& rm -rf /var/lib/apt/lists/*
# Configure system to look for debian packages in the Artifactory repository
# Configure system to look for debian packages in the Artifactory repository
ARG
USER_API_KEY_ARTIFACTS_TECNALIA
ARG
USER_API_KEY_ARTIFACTS_TECNALIA
...
@@ -160,26 +160,24 @@ RUN apt-get install -y \
...
@@ -160,26 +160,24 @@ RUN apt-get install -y \
ros-melodic-joy
ros-melodic-joy
RUN
apt-get update
&&
apt-get
install
-y
\
RUN
apt-get update
&&
apt-get
install
-y
\
spacenavd
\
#spacenavd
\
ros-melodic-spacenav-node
\
#ros-melodic-spacenav-node
\
ros-melodic-ros-control
ros-melodic-ros-control
\
RUN
apt-get update
&&
apt-get
install
-y
\
ros-melodic-rqt-controller-manager
\
ros-melodic-rqt-controller-manager
\
systemd
systemd
RUN
wget https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-telicam-driver_3.0.1.1-1_amd64.deb
\
#
RUN wget https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-telicam-driver_3.0.1.1-1_amd64.deb \
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid_1.8.3+96f35dc6-1_amd64.deb
\
#
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid_1.8.3+96f35dc6-1_amd64.deb \
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-studio_1.8.3+96f35dc6-1_amd64.deb
\
#
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-studio_1.8.3+96f35dc6-1_amd64.deb \
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-tools_1.8.3+96f35dc6-1_amd64.deb
#
https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-tools_1.8.3+96f35dc6-1_amd64.deb
RUN
dpkg
-i
zivid
*
.deb
#
RUN dpkg -i zivid*.deb
RUN
mv
/usr/include/flann/ext/lz4.h /usr/include/flann/ext/lz4.h.bak
#
RUN mv /usr/include/flann/ext/lz4.h /usr/include/flann/ext/lz4.h.bak
RUN
mv
/usr/include/flann/ext/lz4hc.h /usr/include/flann/ext/lz4.h.bak
#
RUN mv /usr/include/flann/ext/lz4hc.h /usr/include/flann/ext/lz4.h.bak
RUN
ln
-s
/usr/include/lz4.h /usr/include/flann/ext/lz4.h
#
RUN ln -s /usr/include/lz4.h /usr/include/flann/ext/lz4.h
RUN
ln
-s
/usr/include/lz4hc.h /usr/include/flann/ext/lz4hc.h
#
RUN ln -s /usr/include/lz4hc.h /usr/include/flann/ext/lz4hc.h
RUN
apt-get update
&&
apt-get
install
-y
\
RUN
apt-get update
&&
apt-get
install
-y
\
ros-melodic-moveit-resources
\
ros-melodic-moveit-resources
\
...
...
This diff is collapsed.
Click to expand it.
dotfiles/system.bash
+
4
−
1
View file @
10f22ec2
#
Manual alias
es
#
Directori
es
alias
ll
=
'lsd -lh --group-dirs=first'
alias
ll
=
'lsd -lh --group-dirs=first'
alias
la
=
'lsd -a --group-dirs=first'
alias
la
=
'lsd -a --group-dirs=first'
alias
l
=
'lsd --group-dirs=first'
alias
l
=
'lsd --group-dirs=first'
alias
lla
=
'lsd -lha --group-dirs=first'
alias
lla
=
'lsd -lha --group-dirs=first'
alias ls
=
'lsd --group-dirs=first'
alias ls
=
'lsd --group-dirs=first'
# Files
alias cat
=
'bat'
alias cat
=
'bat'
# Python
alias
ipy
=
'ipython'
\ No newline at end of file
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