Skip to content
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

Jump to bottom

bump debian base images to debian stretch #52744

Merged
merged 1 commit into from
Nov 10, 2017
Merged

bump debian base images to debian stretch #52744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
#
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v8
debian_iptables_version=v9
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD.
case $1 in
Expand Down
3 changes: 1 addition & 2 deletions build/debian-base/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ RUN echo "Yes, do as I say!" | apt-get purge \
debconf-i18n \
e2fslibs \
e2fsprogs \
gcc-4.8-base \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be gcc-6-base

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added gcc-6-base

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you forget to push it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took out gcc-6-base some time ago, because there were errors later in the build.

#52744 (comment)

init \
initscripts \
libcap2-bin \
Expand All @@ -54,7 +53,7 @@ RUN echo "Yes, do as I say!" | apt-get purge \
libudev1 \
libblkid1 \
libncursesw5 \
libprocps3 \
libprocps6 \
libslang2 \
libss2 \
libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \
Expand Down
12 changes: 6 additions & 6 deletions build/debian-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ REGISTRY ?= gcr.io/google-containers
IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build

TAG ?= 0.2
TAG ?= 0.3

TAR_FILE ?= rootfs.tar
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1

ifeq ($(ARCH),amd64)
BASEIMAGE?=debian:jessie
BASEIMAGE?=debian:stretch
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=arm32v7/debian:jessie
BASEIMAGE?=arm32v7/debian:stretch
QEMUARCH=arm
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=arm64v8/debian:jessie
BASEIMAGE?=arm64v8/debian:stretch
QEMUARCH=aarch64
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/debian:jessie
BASEIMAGE?=ppc64le/debian:stretch
QEMUARCH=ppc64le
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=s390x/debian:jessie
BASEIMAGE?=s390x/debian:stretch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm having trouble building the base image for s390x. It seems the /sbin/ldconfig binary in debian:stretch is either broken or doesn't work with qemu:

Processing triggers for libc-bin (2.24-11+deb9u1) ...
/var/lib/dpkg/info/libc-bin.postinst: 49: /var/lib/dpkg/info/libc-bin.postinst: ldconfig: Exec format error
/var/lib/dpkg/info/libc-bin.postinst: 49: /var/lib/dpkg/info/libc-bin.postinst: ldconfig: Exec format error
dpkg: error processing package libc-bin (--configure):
 subprocess installed post-installation script returned error exit status 2
Errors were encountered while processing:
 libc-bin

@gajju26

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From debian:jessie:

root@219babe053eb:/# file /sbin/ldconfig
/sbin/ldconfig: POSIX shell script, ASCII text executable
root@219babe053eb:/# file /sbin/ldconfig.real
/sbin/ldconfig.real: ELF 64-bit MSB executable, IBM S/390, version 1 (SYSV), statically linked, for GNU/Linux 2.6.32, BuildID[sha1]=0489f9fffcaa0413e00565d6b53344244f686103, stripped

From debian:stretch:

root@1343b24ec59d:/# file /sbin/ldconfig
/sbin/ldconfig: ELF 64-bit MSB executable, IBM S/390, version 1 (GNU/Linux), statically linked, for GNU/Linux 3.2.0, BuildID[sha1]=90b64604014aafac9c1a0623b1cf447281d1a382, stripped

I'm guessing that GNU/Linux vs SYSV difference might be the issue? Not sure how to resolve, though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ixdy i submitted an issue upstream. When I download the various released qemu-static binaries from the 2.9.1 tag, their release version tell me 2.9.0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also created a fix to mask off the e_ident ELF flags from the binfmt 390x files in the qemu-user-static project.

I will update this issue once the patch gets merged upstream in the qemu-user-static project.

multiarch/qemu-user-static#31

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested a local build with this upstream patch. The s390x image successfully gets built.

QEMUARCH=s390x
endif

Expand Down
2 changes: 1 addition & 1 deletion build/debian-hyperkube-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ TAG=0.6
ARCH?=amd64
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems like the TAG bump here got lost :\

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, so many bumps I forgot to bump it an extra time. fixed!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like the bump in cluster/images/hyperkube/Makefile got lost, too.

CACHEBUST?=1

BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
CNI_VERSION=v0.6.0

TEMP_DIR:=$(shell mktemp -d)
Expand Down
4 changes: 2 additions & 2 deletions build/debian-iptables/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

REGISTRY?="gcr.io/google-containers"
IMAGE=debian-iptables
TAG=v8
TAG=v9
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
QEMUVERSION=v2.9.1
Expand All @@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
QEMUARCH=s390x
endif

BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably bump debian-iptables to v9, right? (I can't comment on the correct line here.)


build:
cp ./* $(TEMP_DIR)
Expand Down
6 changes: 3 additions & 3 deletions build/root/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ http_file(

docker_pull(
name = "debian-iptables-amd64",
digest = "sha256:2e747bc7455b46350d8e57f05c03e109fa306861e7b2a2e8e1cd563932170cf1",
digest = "sha256:efc1d8a37f141869b7e45fa4e153ebea11502ee3d0ac29b25cd94cb02a40a91c",
registry = "gcr.io",
repository = "google-containers/debian-iptables-amd64",
tag = "v8", # ignored, but kept here for documentation
tag = "v9", # ignored, but kept here for documentation
)

docker_pull(
name = "debian-hyperkube-base-amd64",
digest = "sha256:10546d592e58d5fdb2e25d79f291b8ac62c8d3a3d83337ad7309cca766dbebce",
digest = "sha256:1a05a58432254268c31ef5c8d9c21f3d01a40611b14707de6ac2772c0793bd13",
registry = "gcr.io",
repository = "google-containers/debian-hyperkube-base-amd64",
tag = "0.6", # ignored, but kept here for documentation
Expand Down
8 changes: 4 additions & 4 deletions test/images/pets/peer-finder/BASEIMAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/debian-base-amd64:0.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of these test images will probably need their tags bumped, too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please update the VERSION files for each of these?

arm=gcr.io/google-containers/debian-base-arm:0.2
arm64=gcr.io/google-containers/debian-base-arm64:0.2
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2
amd64=gcr.io/google-containers/debian-base-amd64:0.3
arm=gcr.io/google-containers/debian-base-arm:0.3
arm64=gcr.io/google-containers/debian-base-arm64:0.3
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
2 changes: 1 addition & 1 deletion test/images/pets/peer-finder/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0
1.1
8 changes: 4 additions & 4 deletions test/images/pets/redis-installer/BASEIMAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/debian-base-amd64:0.2
arm=gcr.io/google-containers/debian-base-arm:0.2
arm64=gcr.io/google-containers/debian-base-arm64:0.2
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2
amd64=gcr.io/google-containers/debian-base-amd64:0.3
arm=gcr.io/google-containers/debian-base-arm:0.3
arm64=gcr.io/google-containers/debian-base-arm64:0.3
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
2 changes: 1 addition & 1 deletion test/images/pets/redis-installer/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0
1.1
8 changes: 4 additions & 4 deletions test/images/pets/zookeeper-installer/BASEIMAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/debian-base-amd64:0.2
arm=gcr.io/google-containers/debian-base-arm:0.2
arm64=gcr.io/google-containers/debian-base-arm64:0.2
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2
amd64=gcr.io/google-containers/debian-base-amd64:0.3
arm=gcr.io/google-containers/debian-base-arm:0.3
arm64=gcr.io/google-containers/debian-base-arm64:0.3
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
2 changes: 1 addition & 1 deletion test/images/pets/zookeeper-installer/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0
1.1
8 changes: 4 additions & 4 deletions test/images/resource-consumer/BASEIMAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/debian-base-amd64:0.2
arm=gcr.io/google-containers/debian-base-arm:0.2
arm64=gcr.io/google-containers/debian-base-arm64:0.2
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2
amd64=gcr.io/google-containers/debian-base-amd64:0.3
arm=gcr.io/google-containers/debian-base-arm:0.3
arm64=gcr.io/google-containers/debian-base-arm64:0.3
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
2 changes: 1 addition & 1 deletion test/images/resource-consumer/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2
1.3
2 changes: 1 addition & 1 deletion test/utils/image/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var (
Porter = ImageConfig{e2eRegistry, "porter", "1.0"}
PortForwardTester = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"}
Redis = ImageConfig{e2eRegistry, "redis", "1.0"}
ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.1"}
ResourceConsumer = ImageConfig{e2eRegistry, "resource-consumer", "1.3"}
ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"}
ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.0"}
TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0"}
Expand Down