Merge pull request #16 from opencomputeproject/master

merge from upstream
This commit is contained in:
Lewis Kang
2018-05-02 15:26:45 +08:00
committed by GitHub
7 changed files with 45 additions and 1 deletions

View File

@@ -0,0 +1,17 @@
############################################################
#
# Minor updates.
# - libelf-dev for kernel 4.14
# - cryptsetup-bin
#
############################################################
FROM opennetworklinux/builder8:1.7
MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
RUN apt-get update && apt-get install libelf-dev && apt-get install cryptsetup-bin
#
# Docker shell and other container tools.
#
COPY docker_shell /bin/docker_shell
COPY container-id /bin/container-id

View File

@@ -0,0 +1,19 @@
VERSION=1.8
USER=opennetworklinux
REPO=builder8
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)

View File

@@ -18,7 +18,7 @@ g_current_uid = os.getuid()
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.7"
g_builder8_image_name="opennetworklinux/builder8:1.8"
g_builder9_image_name="opennetworklinux/builder9:1.1"
g_default_image_name=g_builder8_image_name

View File

@@ -5,6 +5,8 @@
############################################################
include $(ONL)/make/config.mk
export TOOLCHAIN := x86_64-linux-gnu
export CROSS_COMPILER := $(TOOLCHAIN)-
export ARCH := amd64
export UARCH := AMD64
export ARCH_BOOT := grub
export __$(ARCH)__ := 1

View File

@@ -5,6 +5,8 @@
############################################################
include $(ONL)/make/config.mk
export TOOLCHAIN := aarch64-linux-gnu
export CROSS_COMPILER := $(TOOLCHAIN)-
export ARCH := arm64
export UARCH := ARM64
export ARCH_BOOT := uboot
export __$(ARCH)__ := 1

View File

@@ -5,6 +5,8 @@
############################################################
include $(ONL)/make/config.mk
export TOOLCHAIN := arm-linux-gnueabi
export CROSS_COMPILER := $(TOOLCHAIN)-
export ARCH := armel
export UARCH := ARMEL
export ARCH_BOOT := uboot
export __$(ARCH)__ := 1

View File

@@ -5,6 +5,8 @@
############################################################
include $(ONL)/make/config.mk
export TOOLCHAIN := powerpc-linux-gnu
export CROSS_COMPILER := $(TOOLCHAIN)-
export ARCH := powerpc
export UARCH := PPC
export ARCH_BOOT := uboot
export __$(ARCH)__ := 1