Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
portapack-mayhem
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mcules
portapack-mayhem
Commits
4c60aed5
Commit
4c60aed5
authored
5 years ago
by
Yannick M. Dixken
Browse files
Options
Downloads
Patches
Plain Diff
fixed the docker build process by installing pip manually
parent
f4ebf4a2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dockerfile
+6
-1
6 additions, 1 deletion
dockerfile
dockerfile-nogit
+6
-2
6 additions, 2 deletions
dockerfile-nogit
with
12 additions
and
3 deletions
dockerfile
+
6
−
1
View file @
4c60aed5
...
...
@@ -14,8 +14,13 @@ COPY ./ /havocsrc
#Fetch dependencies from APT
RUN
apt-get update
&&
\
apt-get
install
-y
tar
wget dfu-util cmake python
python-pip
&&
\
apt-get
install
-y
tar
wget dfu-util cmake python
curl
&&
\
apt-get
-qy
autoremove
#Install pip from PyPa
RUN
curl https://bootstrap.pypa.io/get-pip.py
-o
get-pip.py
&&
\
python get-pip.py
#Fetch additional dependencies from Python 2.x pip
RUN
pip
install
pyyaml
...
...
This diff is collapsed.
Click to expand it.
dockerfile-nogit
+
6
−
2
View file @
4c60aed5
...
...
@@ -11,9 +11,13 @@ WORKDIR /havoc/firmware
# Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y git tar wget dfu-util cmake python3
python-pip
ccache && \
apt-get install -y git tar wget dfu-util cmake python3 ccache
curl
&& \
apt-get -qy autoremove
#Install pip from PyPa
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python get-pip.py
RUN pip install pyyaml
# Grab the GNU ARM toolchain from arm.com
...
...
@@ -28,4 +32,4 @@ RUN mkdir ~/bin && cd ~/bin && \
for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
CMD cd .. && cd build && \
cmake .. && make firmware
\ No newline at end of file
cmake .. && make firmware
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