Skip to content

Commit 20ca3d0

Browse files
authored
[Feature:Autograding] valgrind for amd autograding-default (#69)
### What is the new behavior? valgrind is not available on amd image for autograding-default (valgrind is not available on arm) --------- Co-authored-by: Barb Cutler <Barb Cutler>
1 parent 78e33b6 commit 20ca3d0

File tree

1 file changed

+14
-5
lines changed
  • dockerfiles/autograding-default/ubuntu-22.04

1 file changed

+14
-5
lines changed

dockerfiles/autograding-default/ubuntu-22.04/Dockerfile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66

77
FROM ubuntu:22.04
88

9+
ARG TARGETARCH
10+
911
RUN apt-get update
1012
RUN apt-get install -y python3
1113
RUN apt-get install -y libpython3.10
1214
RUN apt-get install -y python3-dev
1315
RUN apt-get install -y clang lld lldb
1416
RUN apt-get install -y gcc g++
15-
#RUN apt-get install -y gdb
17+
18+
RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y gdb; fi
1619

1720
RUN apt-get install -y autoconf automake autotools-dev
1821
RUN apt-get install -y diffstat
1922
RUN apt-get install -y finger sed
20-
RUN apt-get -y install locales
23+
RUN apt-get install -y locales
2124

2225
RUN apt-get install -y git
2326
RUN apt-get install -y git-man
@@ -26,17 +29,23 @@ RUN apt-get install -y p7zip-full
2629
RUN apt-get install -y patchutils
2730
RUN apt-get install -y libpq-dev
2831
RUN apt-get install -y unzip zip
29-
#RUN apt-get install -y valgrind
32+
33+
RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y valgrind; fi
34+
3035
RUN apt-get install -y libmagic-ocaml-dev
3136
RUN apt-get install -y javascript-common
3237
RUN apt-get install -y libfile-mmagic-perl libgnupg-interface-perl libbsd-resource-perl libarchive-zip-perl
3338
RUN apt-get install -y jq libseccomp-dev libseccomp2 seccomp
34-
#RUN apt-get install -y junit
39+
40+
RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y junit; fi
41+
3542
RUN apt-get install -y flex
3643
RUN apt-get install -y bison
3744
RUN apt-get install -y spim
3845
RUN apt-get install -y poppler-utils
39-
#RUN apt-get install -y imagemagick
46+
47+
RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y imagemagick; fi
48+
4049
RUN apt-get install -y cloc
4150

4251
ENV LANG C.UTF-8

0 commit comments

Comments
 (0)