Skip to content

Commit b9f9b09

Browse files
committed
update the linux build environment to reflect docs.rs
1 parent 0a111aa commit b9f9b09

File tree

4 files changed

+295
-70
lines changed

4 files changed

+295
-70
lines changed

Diff for: Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
FROM debian:stretch
1+
FROM ubuntu:bionic
22

33
# Install the packages contained in `packages.txt`
44
COPY packages.txt /opt/crates-build-env/packages.txt
55
RUN apt-get update && cat /opt/crates-build-env/packages.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y
66

7-
# Install the packages contained in `packages-backports.txt`
8-
RUN echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list
9-
COPY packages-backports.txt /opt/crates-build-env/packages-backports.txt
10-
RUN apt-get update && cat /opt/crates-build-env/packages-backports.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -t stretch-backports -y
11-
127
# Setup the entrypoint
138
COPY entrypoint.sh /opt/crates-build-env/entrypoint.sh
149
ENTRYPOINT ["/opt/crates-build-env/entrypoint.sh"]

Diff for: ci/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -euo pipefail
33
IFS=$'\n\t'
44

55
# Ensure packages lists are sorted
6-
for file in packages packages-backports; do
6+
for file in packages; do
77
cat "${file}.txt" | sort > "/tmp/sorted-${file}.txt"
88
if ! diff "/tmp/sorted-${file}.txt" "${file}.txt" >/dev/null 2>&1; then
99
echo "Lint error: ${file}.txt is not sorted"

Diff for: packages-backports.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)