From 3acb3304f398393f64aa787ad1bc4f67f1a8d4ce Mon Sep 17 00:00:00 2001 From: "David J. Malan" Date: Sat, 18 Nov 2023 22:37:49 -0500 Subject: [PATCH] Removes weasyprint, gh --- Dockerfile | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97de791..2c3bf2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -109,9 +109,8 @@ FROM ubuntu:22.04 LABEL maintainer="sysadmins@cs50.harvard.edu" ARG DEBIAN_FRONTEND=noninteractive -COPY --from=builder /usr/bin/ /usr/bin/ -COPY --from=builder /usr/local/ /usr/local/ -COPY --from=builder /opt/ /opt/ +COPY --from=builder /usr /usr +COPY --from=builder /opt /opt # Avoid "delaying package configuration, since apt-utils is not installed" RUN apt update && \ @@ -147,33 +146,33 @@ RUN curl https://packagecloud.io/install/repositories/cs50/repo/script.deb.sh | apt install --no-install-recommends --yes \ astyle \ bash-completion \ - build-essential `# libc, gcc, g++, make, dpkg-dev etc.`\ + build-essential `# dpkg-dev, libc, gcc, g++, make, etc.`\ clang \ - coreutils `# For fold` \ + coreutils `# For fold` \ cowsay \ dos2unix \ - dnsutils `# For nslookup` \ - fonts-noto-color-emoji `# For render50` \ + dnsutils `# For nslookup` \ + fonts-noto-color-emoji `# For render50` \ gdb \ git \ git-lfs \ jq \ less \ - libcs50 `# CS50 library` \ - libmagic-dev `# For style50` \ - libyaml-0-2 `# Runtime package for gem` \ + libcs50 \ + libmagic-dev `# For style50` \ + libpango-1.0-0 libharfbuzz0b libpangoft2-1.0-0 `# For render50` \ + libyaml-0-2 `# Runtime package for gem` \ man \ man-db \ nano \ - openssh-client `# For ssh-keygen` \ - psmisc `# For fuser` \ - ruby-dev `# Ruby development headers` \ + openssh-client `# For ssh-keygen` \ + psmisc `# For fuser` \ + ruby-dev `# Ruby development headers` \ sudo \ - tzdata `# For TZ` \ + tzdata `# For TZ` \ unzip \ valgrind \ vim \ - weasyprint `# For render50` \ zip && \ apt clean && \ pip3 install --no-cache-dir \