mirror of
https://github.com/Telecominfraproject/OpenNetworkLinux.git
synced 2025-12-24 16:57:02 +00:00
Merge branch 'master' of github.com:opencomputeproject/OpenNetworkLinux into iproc-4.14-latest
This commit is contained in:
27
docker/images/builder9/1.3/Dockerfile
Normal file
27
docker/images/builder9/1.3/Dockerfile
Normal file
@@ -0,0 +1,27 @@
|
||||
############################################################
|
||||
#
|
||||
# Add armel and armhf
|
||||
#
|
||||
############################################################
|
||||
FROM opennetworklinux/builder9:1.2
|
||||
MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
|
||||
|
||||
RUN dpkg --add-architecture armel
|
||||
RUN dpkg --add-architecture armhf
|
||||
|
||||
RUN apt-get update && apt-get upgrade -y
|
||||
|
||||
RUN apt-get install -y \
|
||||
crossbuild-essential-armel \
|
||||
gcc-arm-linux-gnueabi \
|
||||
crossbuild-essential-armhf \
|
||||
gcc-arm-linux-gnueabi
|
||||
|
||||
RUN xapt -a armel libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
|
||||
RUN xapt -a armhf libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
|
||||
|
||||
#
|
||||
# Docker shell and other container tools.
|
||||
#
|
||||
COPY docker_shell /bin/docker_shell
|
||||
COPY container-id /bin/container-id
|
||||
19
docker/images/builder9/1.3/Makefile
Normal file
19
docker/images/builder9/1.3/Makefile
Normal file
@@ -0,0 +1,19 @@
|
||||
VERSION=1.3
|
||||
USER=opennetworklinux
|
||||
REPO=builder9
|
||||
|
||||
TOOLS=../../../tools/docker_shell ../../../tools/container-id
|
||||
|
||||
build: check_version
|
||||
cp $(TOOLS) .
|
||||
docker build -t $(USER)/$(REPO):$(VERSION) .
|
||||
rm -rf $(notdir $(TOOLS))
|
||||
|
||||
#
|
||||
# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
|
||||
# when a new image is built but the VERSION variable is not updated.
|
||||
#
|
||||
check_version:
|
||||
|
||||
push:
|
||||
docker push $(USER)/$(REPO):$(VERSION)
|
||||
@@ -19,7 +19,7 @@ g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
|
||||
|
||||
g_builder7_image_name="opennetworklinux/builder7:1.2"
|
||||
g_builder8_image_name="opennetworklinux/builder8:1.9"
|
||||
g_builder9_image_name="opennetworklinux/builder9:1.2"
|
||||
g_builder9_image_name="opennetworklinux/builder9:1.3"
|
||||
|
||||
g_default_image_name=g_builder8_image_name
|
||||
g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)
|
||||
|
||||
Submodule sm/build-artifacts updated: 48603f21bc...aa92be2faa
2
sm/infra
2
sm/infra
Submodule sm/infra updated: f78cc91121...168b695e51
Reference in New Issue
Block a user