Skip to content

Commit

Permalink
Upgrade docker image to Ubuntu 20.04 focal
Browse files Browse the repository at this point in the history
  • Loading branch information
dcwangmit01 authored and hangxie committed May 1, 2020
1 parent 38e3672 commit 7383923
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion files/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic AS build-cache-base
FROM ubuntu:focal AS build-cache-base

ARG GITHUB_API_TOKEN

Expand Down
8 changes: 6 additions & 2 deletions files/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,15 @@ function layer_install_os_packages() {
xauth \
zip && \
curl -sSfL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
# TODO: Docker does not have a release file for Ubuntu 20.04 focal yet
# Thus use bionic. Eventually 'bionic' with '$(lsb_release -cs)` in the line below
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
bionic \
stable" && \
export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
# TODO: Google does not have a release file for Ubuntu 20.04 focal yet
# Thus use bionic. Eventually replace 'bionic' with '$(lsb_release -c -s)' in the line below
export CLOUD_SDK_REPO="cloud-sdk-bionic" && \
echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl -sSfL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
export POSTGRESQL_REPO="$(lsb_release -c -s)-pgdg" && \
Expand Down

0 comments on commit 7383923

Please sign in to comment.