Skip to content

Commit

Permalink
Merge pull request #218 from cs50/ubuntu-24.04
Browse files Browse the repository at this point in the history
Ubuntu 24.04
  • Loading branch information
rongxin-liu authored Jun 23, 2024
2 parents 6bd22a1 + 0c39286 commit c9772b4
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM ubuntu:22.04 as builder
FROM ubuntu:24.04 as builder


# Build-time variables
Expand Down Expand Up @@ -126,11 +126,16 @@ RUN cd /tmp && \
# Final stage
FROM ubuntu:22.04
FROM ubuntu:24.04
LABEL maintainer="sysadmins@cs50.harvard.edu"
ARG DEBIAN_FRONTEND=noninteractive
# Remove exisiting ubuntu user (if any) and home directory
RUN userdel --force --remove ubuntu && \
rm --force --recursive /home/ubuntu
# Copy files from builder
COPY --from=builder /opt /opt
COPY --from=builder /usr/local /usr/local
Expand Down Expand Up @@ -187,7 +192,7 @@ RUN apt update && \
libncurses-dev \
libpango-1.0-0 libharfbuzz0b libpangoft2-1.0-0 `# For render50` \
libpangocairo-1.0-0 `# For R` \
libtiff5 `# For R` \
libtiff6 `# For R` \
libxt6 `# For R` \
libgmp-dev `# For gem` \
libffi-dev `# For gem` \
Expand Down

0 comments on commit c9772b4

Please sign in to comment.