Skip to content

Commit 3765f09

Browse files
committed
Try #263:
2 parents 718a19c + a081533 commit 3765f09

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

build-docker-image.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -ex
44

55
run() {
66
docker build \
7+
--pull \
78
-t japaric/$1:${TRAVIS_TAG:-latest} \
89
-f docker/${1}/Dockerfile \
910
docker

docker/armv7-unknown-linux-gnueabihf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:12.04
1+
FROM ubuntu:14.04
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

docker/dropbear.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set -ex
22

33
main() {
4-
local version=2017.75 \
4+
local version=2019.77 \
55
td=$(mktemp -d)
66

77
local dependencies=(
@@ -24,7 +24,7 @@ main() {
2424

2525
pushd $td
2626

27-
curl -L https://matt.ucc.asn.au/dropbear/dropbear-$version.tar.bz2 | \
27+
curl -L https://matt.ucc.asn.au/dropbear/releases/dropbear-$version.tar.bz2 | \
2828
tar --strip-components=1 -xj
2929

3030
# Remove some unwanted message

docker/i686-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:12.04
1+
FROM ubuntu:14.04
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

docker/linux-image.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,22 @@ main() {
3333
;;
3434
powerpc)
3535
# there is no stretch powerpc port, so we use jessie
36-
# use a more recent kernel from backports
37-
kernel=4.9.0-0.bpo.6-powerpc
36+
# use a more recent kernel from jessie-updates
37+
kernel=3.16.0-6-powerpc
3838
debsource="deb http://http.debian.net/debian/ jessie main"
39-
debsource="$debsource\ndeb http://http.debian.net/debian/ jessie-backports main"
39+
debsource="$debsource\ndeb http://http.debian.net/debian/ jessie-updates main"
4040
dropbear="dropbear"
4141
libssl="libssl1.0.0"
4242
;;
4343
powerpc64)
4444
# there is no stable port
4545
arch=ppc64
46-
kernel=4.19.0-1-powerpc64
46+
kernel=4.19.0-4-powerpc64
4747
debsource="deb http://ftp.ports.debian.org/debian-ports/ unreleased main"
4848
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports/ unstable main"
49-
# sid version of dropbear requeries this depencendies
49+
# sid version of dropbear requeries this dependencies
5050
deps="libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64"
51+
libssl="libssl1.1"
5152
;;
5253
powerpc64le)
5354
arch=ppc64el
@@ -59,11 +60,12 @@ main() {
5960
;;
6061
sparc64)
6162
# there is no stable port
62-
kernel=4.19.0-1-sparc64
63+
kernel=4.19.0-4-sparc64
6364
debsource="deb http://ftp.ports.debian.org/debian-ports/ unreleased main"
6465
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports/ unstable main"
65-
# sid version of dropbear requeries this depencendies
66+
# sid version of dropbear requeries this dependencies
6667
deps="libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64"
68+
libssl="libssl1.1"
6769
;;
6870
x86_64)
6971
arch=amd64

docker/x86_64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:12.04
1+
FROM ubuntu:14.04
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)