diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-01-22 18:39:56 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-01-22 18:39:56 +0100 |
| commit | cf6c1eb20951bcf6be32cab495da03bc4f68bf8a (patch) | |
| tree | d91a826a018d3e4226b9b0c7c19ce75906ec7f45 | |
| parent | 95612ea3b7a54b810b8a2f5ee2e3a29660b3c78b (diff) | |
| parent | 2fea01a9f0db4107bfcca79fabe8e11403050d9e (diff) | |
Merge branch 'pu/release-preparations'
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 10 | ||||
| -rw-r--r-- | shippable.yml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile index 08aed4836..49934e46c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:testing +FROM debian:buster COPY . /tmp WORKDIR /tmp RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.list \ diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 9700e1cf8..b89d9de93 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -271,11 +271,11 @@ <!ENTITY apt-product-version "1.8.0~alpha3"> <!-- (Code)names for various things used all over the place --> -<!ENTITY debian-oldstable-codename "jessie"> -<!ENTITY debian-stable-codename "stretch"> -<!ENTITY debian-testing-codename "buster"> -<!ENTITY debian-stable-version "9"> -<!ENTITY ubuntu-codename "xenial"> +<!ENTITY debian-oldstable-codename "stretch"> +<!ENTITY debian-stable-codename "buster"> +<!ENTITY debian-testing-codename "bullseye"> +<!ENTITY debian-stable-version "10"> +<!ENTITY ubuntu-codename "disco"> <!-- good and bad just refers to matching and not matching a pattern… It is not a remark about the specific perl version. diff --git a/shippable.yml b/shippable.yml index 3978ddcb5..8588fcf15 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,8 +4,8 @@ env: build: pre_ci_boot: - image_name: ubuntu - image_tag: bionic + image_name: debian + image_tag: buster pull: true ci: - apt-get install -qq build-essential expect |