scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-11-03 03:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from sonoble/onlbuilder_1_1

Browse Source 
updated onlbuilder7/8 to v1.1 adding new programs
This commit is contained in:
Jeffrey Townsend
2016-02-16 14:06:59 -08:00
parent fbaccf6cb2 b13e14d6e4
commit 92e138edaa
5 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker/images/builder7/1.1/Dockerfile Normal file
View File

@@ -0,0 +1,12 @@
FROM opennetworklinux/builder7:1.0
MAINTAINER Rob Sherwood <rob.sherwood@bigswitch.com>
RUN apt-get update && apt-get install -y \
libpcap-dev \
telnet \
gdb
#
# Docker shell and other container tools.
#
COPY docker_shell /bin/docker_shell
COPY container-id /bin/container-id

20
docker/images/builder7/1.1/Makefile Normal file
View File

@@ -0,0 +1,20 @@
VERSION=1.1
USER=opennetworklinux
REPO=builder7
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)

12
docker/images/builder8/1.1/Dockerfile Normal file
View File

@@ -0,0 +1,12 @@
FROM opennetworklinux/builder8:1.0
MAINTAINER Rob Sherwood <rob.sherwood@bigswitch.com>
RUN apt-get update && apt-get install -y \
libpcap-dev \
telnet \
gdb
#
# Docker shell and other container tools.
#
COPY docker_shell /bin/docker_shell
COPY container-id /bin/container-id

19
docker/images/builder8/1.1/Makefile Normal file
View File

@@ -0,0 +1,19 @@
VERSION=1.1
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)

4
docker/tools/onlbuilder
View File

@@ -17,8 +17,8 @@ g_current_user = getpass.getuser()
g_current_uid = os.getuid()
g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
g_builder7_image_name="opennetworklinux/builder7:1.0"
g_builder8_image_name="opennetworklinux/builder8:1.0"
g_builder7_image_name="opennetworklinux/builder7:1.1"
g_builder8_image_name="opennetworklinux/builder8:1.1"
g_default_image_name=g_builder7_image_name
g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)