From 8d8d1f565301200a8bf92290e675b227875a64f9 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Thu, 25 Jun 2026 15:43:02 -0400 Subject: [PATCH 1/3] remove install of submitty_count --- dockerfiles/autograding-default/ubuntu-22.04/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile b/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile index 29a05e7..042c2eb 100644 --- a/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile +++ b/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile @@ -71,7 +71,6 @@ RUN apt-get update \ && chown -R root:${COURSE_BUILDERS_GROUP} ${SUBMITTY_INSTALL_DIR}/drmemory \ && chmod -R 755 ${SUBMITTY_INSTALL_DIR}/drmemory \ && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools \ - && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/count" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/count \ && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/plagiarism" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/plagiarism \ && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/diagnostics" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/diagnostics \ && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS/build \ From 567ff27e29d7a2578f3de4ca0b8ab228ea8ee93a Mon Sep 17 00:00:00 2001 From: dagemcn Date: Thu, 9 Jul 2026 09:49:06 -0400 Subject: [PATCH 2/3] reverted original file and created new Dockerfile --- .../ubuntu-22.04-v2/Dockerfile | 101 ++++++++++++++++++ .../ubuntu-22.04/Dockerfile | 1 + 2 files changed, 102 insertions(+) create mode 100644 dockerfiles/autograding-default/ubuntu-22.04-v2/Dockerfile diff --git a/dockerfiles/autograding-default/ubuntu-22.04-v2/Dockerfile b/dockerfiles/autograding-default/ubuntu-22.04-v2/Dockerfile new file mode 100644 index 0000000..042c2eb --- /dev/null +++ b/dockerfiles/autograding-default/ubuntu-22.04-v2/Dockerfile @@ -0,0 +1,101 @@ +# Note: This Dockerfile represents the original "Ubuntu" build image +# that Submitty included inside the main repo. As such, it does +# not have the same conventions as the other images and does not have +# any metadata.json file or is made up of components parts. Have to edit +# this file directly. + +FROM ubuntu:22.04 + +ARG TARGETARCH + +RUN apt-get update +RUN apt-get install -y python3 +RUN apt-get install -y libpython3.10 +RUN apt-get install -y python3-dev +RUN apt-get install -y clang lld lldb +RUN apt-get install -y gcc g++ + +RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y gdb; fi + +RUN apt-get install -y autoconf automake autotools-dev +RUN apt-get install -y diffstat +RUN apt-get install -y finger sed +RUN apt-get install -y locales + +RUN apt-get install -y git +RUN apt-get install -y git-man +RUN apt-get install -y dpkg-dev +RUN apt-get install -y p7zip-full +RUN apt-get install -y patchutils +RUN apt-get install -y libpq-dev +RUN apt-get install -y unzip zip + +RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y valgrind; fi + +RUN apt-get install -y libmagic-ocaml-dev +RUN apt-get install -y javascript-common +RUN apt-get install -y libfile-mmagic-perl libgnupg-interface-perl libbsd-resource-perl libarchive-zip-perl +RUN apt-get install -y jq libseccomp-dev libseccomp2 seccomp + +RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y junit; fi + +RUN apt-get install -y flex +RUN apt-get install -y bison +RUN apt-get install -y spim +RUN apt-get install -y poppler-utils + +RUN if [ $TARGETARCH = "amd64" ]; then apt-get install -y imagemagick; fi + +RUN apt-get install -y cloc + +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 +ENV LANGUAGE en_US.UTF-8 +ENV LC_CTYPE=en_US.UTF-8 + +ENV DRMEMORY_TAG release_2.6.0 +ENV DRMEMORY_VERSION 2.6.0 +ENV AnalysisTools_Version v22.03.00 +ENV AnalysisToolsTS_Version v23.10.00 +ENV SUBMITTY_INSTALL_DIR /usr/local/submitty + + +RUN apt-get update \ + && apt-get install -y --no-install-recommends wget ca-certificates rsync \ + && mkdir -p ${SUBMITTY_INSTALL_DIR}/drmemory \ + && cd /tmp \ + && wget https://github.com/DynamoRIO/drmemory/releases/download/${DRMEMORY_TAG}/DrMemory-Linux-${DRMEMORY_VERSION}.tar.gz \ + && tar -xpzf DrMemory-Linux-${DRMEMORY_VERSION}.tar.gz \ + && rsync --delete -a /tmp/DrMemory-Linux-${DRMEMORY_VERSION}/ ${SUBMITTY_INSTALL_DIR}/drmemory \ + && rm -rf /tmp/DrMemory* \ + && chown -R root:${COURSE_BUILDERS_GROUP} ${SUBMITTY_INSTALL_DIR}/drmemory \ + && chmod -R 755 ${SUBMITTY_INSTALL_DIR}/drmemory \ + && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools \ + && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/plagiarism" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/plagiarism \ + && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/diagnostics" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/diagnostics \ + && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS/build \ + && wget -nv "https://github.com/Submitty/AnalysisToolsTS/releases/download/${AnalysisToolsTS_Version}/submitty_count_ts" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS/build/submitty_count_ts \ + && wget -nv "https://github.com/Submitty/AnalysisToolsTS/releases/download/${AnalysisToolsTS_Version}/submitty_diagnostics_ts" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS/build/submitty_diagnostics_ts \ + && chmod -R 755 ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS + + +RUN mkdir -p ${SUBMITTY_INSTALL_DIR}/bin +RUN wget -nv https://raw.githubusercontent.com/Submitty/Submitty/refs/heads/main/bin/comment_count.py -O ${SUBMITTY_INSTALL_DIR}/bin/comment_count.py +RUN chmod -R 755 ${SUBMITTY_INSTALL_DIR}/bin/ +RUN chmod -R 755 ${SUBMITTY_INSTALL_DIR}/bin/comment_count.py + +RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen + +# for debugging system call filtering +RUN apt-get install -y strace + +RUN apt-get purge -y --auto-remove wget +RUN rm -rf /var/lib/apt/lists/* + + + + +#RUN locale-gen +#RUN dpkg-reconfigure locales + + diff --git a/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile b/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile index 042c2eb..29a05e7 100644 --- a/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile +++ b/dockerfiles/autograding-default/ubuntu-22.04/Dockerfile @@ -71,6 +71,7 @@ RUN apt-get update \ && chown -R root:${COURSE_BUILDERS_GROUP} ${SUBMITTY_INSTALL_DIR}/drmemory \ && chmod -R 755 ${SUBMITTY_INSTALL_DIR}/drmemory \ && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools \ + && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/count" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/count \ && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/plagiarism" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/plagiarism \ && wget -nv "https://github.com/Submitty/AnalysisTools/releases/download/${AnalysisTools_Version}/diagnostics" -O ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisTools/diagnostics \ && mkdir -p ${SUBMITTY_INSTALL_DIR}/SubmittyAnalysisToolsTS/build \ From 113c334450b9c81f5b935bc14ab19155665cc4b2 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Thu, 9 Jul 2026 09:50:10 -0400 Subject: [PATCH 3/3] updated metadata with new dockerfile --- dockerfiles/autograding-default/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/autograding-default/metadata.json b/dockerfiles/autograding-default/metadata.json index 1b3402d..e68397b 100644 --- a/dockerfiles/autograding-default/metadata.json +++ b/dockerfiles/autograding-default/metadata.json @@ -1,4 +1,4 @@ { "pushLatest": true, - "latestTag": "ubuntu-22.04" + "latestTag": "ubuntu-22.04-v2" }