Skip to content

Check for updates on base image during build #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Check for updates on base image during build #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21a1a04
Check for updates on base image during build
bltavares Mar 21, 2019
4745a69
Update packages available on Debian repo
bltavares Mar 22, 2019
49e524c
Update dropbear version; Previous version was moved
bltavares Mar 23, 2019
773e1ac
Bump ubuntu version, to have newer libc6
bltavares Mar 23, 2019
a081533
Update dropbear release URL
bltavares Apr 1, 2019
00a38c2
Apply suggestions from code review
bltavares May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-docker-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -ex

run() {
docker build \
--pull \
-t japaric/$1:${TRAVIS_TAG:-latest} \
-f docker/${1}/Dockerfile \
docker
Expand Down
2 changes: 1 addition & 1 deletion docker/armv7-unknown-linux-gnueabihf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:12.04
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions docker/dropbear.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -ex

main() {
local version=2017.75 \
local version=2019.77 \
td=$(mktemp -d)

local dependencies=(
Expand All @@ -24,7 +24,7 @@ main() {

pushd $td

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

# Remove some unwanted message
Expand Down
2 changes: 1 addition & 1 deletion docker/i686-unknown-linux-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:12.04
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down
16 changes: 9 additions & 7 deletions docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,22 @@ main() {
;;
powerpc)
# there is no stretch powerpc port, so we use jessie
# use a more recent kernel from backports
kernel=4.9.0-0.bpo.6-powerpc
# use a more recent kernel from jessie-updates
kernel=3.16.0-6-powerpc
debsource="deb http://http.debian.net/debian/ jessie main"
debsource="$debsource\ndeb http://http.debian.net/debian/ jessie-backports main"
debsource="$debsource\ndeb http://http.debian.net/debian/ jessie-updates main"
dropbear="dropbear"
libssl="libssl1.0.0"
;;
powerpc64)
# there is no stable port
arch=ppc64
kernel=4.19.0-1-powerpc64
kernel=4.19.0-4-powerpc64
debsource="deb http://ftp.ports.debian.org/debian-ports/ unreleased main"
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports/ unstable main"
# sid version of dropbear requeries this depencendies
# sid version of dropbear requires these dependencies
deps="libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64"
libssl="libssl1.1"
;;
powerpc64le)
arch=ppc64el
Expand All @@ -59,11 +60,12 @@ main() {
;;
sparc64)
# there is no stable port
kernel=4.19.0-1-sparc64
kernel=4.19.0-4-sparc64
debsource="deb http://ftp.ports.debian.org/debian-ports/ unreleased main"
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports/ unstable main"
# sid version of dropbear requeries this depencendies
# sid version of dropbear requires these dependencies
deps="libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64"
libssl="libssl1.1"
;;
x86_64)
arch=amd64
Expand Down
2 changes: 1 addition & 1 deletion docker/x86_64-unknown-linux-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:12.04
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down