Skip to content

Commit b584c79

Browse files
committed
Update Dockerfiles
master now has 2 dockerfiles, one targeting 122 with C0, and one not Apply updates (fewer RUN lines, do not fetch autodriver from github) to both of them.
1 parent 4d730de commit b584c79

File tree

4 files changed

+56
-83
lines changed

4 files changed

+56
-83
lines changed

autodriver/Dockerfile_122

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Autolab - autograding docker image
2+
3+
FROM ubuntu:14.04
4+
MAINTAINER Mihir Pandya <[email protected]>
5+
6+
RUN apt-get update && apt-get install -y build-essential wget python
7+
8+
# Install autodriver
9+
WORKDIR /home
10+
RUN useradd autolab && useradd autograde
11+
RUN mkdir autolab autograde output && chown autolab:autolab autolab output && chown autograde:autograde autograde
12+
ADD . /home/autodriver
13+
WORKDIR /home/autodriver
14+
RUN make clean && make && install -c -o root -g root -m 4755 autodriver /usr/bin/autodriver && install -c -m 755 autograde_wrapper.py /usr/bin/autograde_wrapper && cp cc0wrap.sh /usr/bin/cc0 && chmod +x /usr/bin/cc0
15+
16+
ENTRYPOINT ["/usr/bin/autograde_wrapper"]
17+
18+
# Install C0
19+
WORKDIR /home
20+
RUN wget http://c0.typesafety.net/dist/cc0-v0440-linux3.18.1-64bit-bin.tgz
21+
RUN tar -C /usr/local -xvzf cc0-*
22+
WORKDIR /usr/local/cc0
23+
RUN bin/cc0 -d doc/src/exp.c0 doc/src/exp-test.c0
24+
#RUN ./a.out
25+
26+
# Clean up
27+
WORKDIR /home
28+
RUN apt-get remove -y wget && apt-get -y autoremove
29+
RUN rm -rf autodriver cc0*
30+
31+
# Check installation
32+
RUN ls -l /home && which autodriver && which cc0

autodriver/Dockerfile_ubuntu

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Autolab - autograding docker image
2+
3+
FROM ubuntu:14.04
4+
MAINTAINER Mihir Pandya <[email protected]>
5+
6+
RUN apt-get update && apt-get install -y build-essential wget python
7+
8+
# Install autodriver
9+
WORKDIR /home
10+
RUN useradd autolab && useradd autograde
11+
RUN mkdir autolab autograde output && chown autolab:autolab autolab output && chown autograde:autograde autograde
12+
ADD . /home/autodriver
13+
WORKDIR /home/autodriver
14+
RUN make clean && make && install -c -o root -g root -m 4755 autodriver /usr/bin/autodriver && install -c -m 755 autograde_wrapper.py /usr/bin/autograde_wrapper
15+
16+
ENTRYPOINT ["/usr/bin/autograde_wrapper"]
17+
18+
# Clean up
19+
WORKDIR /home
20+
RUN apt-get remove -y wget && apt-get -y autoremove
21+
RUN rm -rf autodriver
22+
23+
# Check installation
24+
RUN ls -l /home && which autodriver

vmms/Dockerfile_122

Lines changed: 0 additions & 49 deletions
This file was deleted.

vmms/Dockerfile_ubuntu

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)