Skip to content

Update Docker from 1.12.1 to 1.12.2 #157

Merged
merged 7 commits into from
Oct 31, 2016
Merged

Update Docker from 1.12.1 to 1.12.2 #157

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28cadaf
docker: Update version from 1.12.1 to 1.12.2
pmenzel Oct 20, 2016
9f0bdc0
docker: Tell git what branch to clone
pmenzel Oct 20, 2016
4151031
docker: Create a shallow clone
pmenzel Oct 20, 2016
5b08597
docker: Prefix build commands with `start_cmd`
pmenzel Oct 20, 2016
46bd261
docker: Build package from release tarball
pmenzel Oct 20, 2016
417184d
docker: Increment revision to 1.12.2-1
pmenzel Oct 20, 2016
407de2d
docker: Remove unneeded suffix in `BEE_VERSION`
pmenzel Oct 28, 2016
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
15 changes: 7 additions & 8 deletions docker.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION docker-1.12.1-1.bee
# BEE_VERSION docker-1.12.2-1

# NOTE: We require a running docker environment. For the first bootstrap
# this can be provided by the package docker_binary
Expand All @@ -12,7 +12,7 @@
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

# SRCURL[0]=""
SRCURL[0]="https://github.com/docker/docker/archive/v${PKGVERSION}.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand Down Expand Up @@ -48,10 +48,9 @@ build_in_sourcedir
## Make sure the mee_install function does install everything to the
## image directory "${D}"

mee_extract() {
git clone https://github.com/docker/docker.git $S
( cd $S && git checkout v${PKGVERSION} )
}
#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
Expand All @@ -62,8 +61,8 @@ mee_configure() {
}

mee_build() {
make build
make binary
start_cmd make build
start_cmd make DOCKER_GITCOMMIT=bb80604 binary
Copy link
Collaborator

Choose a reason for hiding this comment

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

How is this fixed string going to be maintained when we update the package?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

git show tagnumber and take the commit from there, until upstream fixes this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Which would be extra work an can be forgotten or done wrongly. What is the disadvantage of the mee_extract() with git clone ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

You don’t have to redownload the package each time. Bee’s defaults can be used.

}

mee_install() {
Expand Down