Skip to content

Commit

Permalink
Set ubuntu 20.04 as new base image
Browse files Browse the repository at this point in the history
We would at some point need to set this as the default.
To prepare for that, I think we should make this an option
that is available, and run our tests on this too.

The R stack seems possibly currently unavailable for 20.04
(see https://community.rstudio.com/t/rstudio-server-ubuntu-20-04/64188)
but I'll try it out
  • Loading branch information
yuvipanda committed Jun 9, 2020
1 parent ebf973a commit 28df4d7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions repo2docker/buildpacks/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from traitlets import Dict

TEMPLATE = r"""
FROM buildpack-deps:bionic
FROM buildpack-deps:focal
# avoid prompts from apt
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -55,7 +55,7 @@
${NB_USER}
RUN wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
DISTRO="bionic" && \
DISTRO="focal" && \
echo "deb https://deb.nodesource.com/node_10.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list
Expand Down
2 changes: 1 addition & 1 deletion tests/memlimit/dockerfile/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal

RUN apt-get update && apt-get install --yes python3

Expand Down

0 comments on commit 28df4d7

Please sign in to comment.