Skip to content

Commit

Permalink
Now with working implementation of the dockerfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
STFleming committed Jun 3, 2016
1 parent 95bfc0c commit 6f53d57
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:14.04
MAINTAINER Shane Fleming <[email protected]>
MAINTAINER Shane T. Fleming <[email protected]>

# ________ _________ ___ _________ ________ ___ ___ ___ ___ ________
# |\ ____\|\___ ___\\ \|\___ ___\\ ____\|\ \|\ \|\ \|\ \|\ __ \
Expand Down Expand Up @@ -53,6 +53,10 @@ WORKDIR /home/stitchup

#RUN sed -i -r -e "s/CONFIG\s+\+= debug_and_release display_graphs/CONFIG \+= debug_and_release #display_graphs/g" legup-4.0/gui/scheduleviewer/scheduleviewer.pro

#TODO: Temp fix, remove some things that were causing problems in build flow
RUN sed -i '/pcie/d' /home/stitchup/legup-4.0/Makefile
RUN sed -i '/gui/d' /home/stitchup/legup-4.0/Makefile

RUN (cd /home/stitchup/legup-4.0 && make)

#Edit the startup message that is displayed
Expand All @@ -65,10 +69,12 @@ RUN echo "echo \" ____\_\ \ \ \__\ \ \__\ \ \__\ \ \_______\ \__\ \__\ \
RUN echo "echo \" |\_________\ \|__| \|__| \|__| \|_______|\|__|\|__|\|_______|\|__| \"" >> /home/stitchup/.bashrc
RUN echo "echo \" \|_________| \"" >> /home/stitchup/.bashrc

RUN apt-get install software-properties-common
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
USER root
RUN apt-get -y install software-properties-common
RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
RUN apt-get -y update
RUN apt-get -y install gcc-4.9 g++-4.9
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
USER stitchup

RUN ./patch /home/stitchup/legup-4.0

0 comments on commit 6f53d57

Please sign in to comment.