Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit cebe170

Browse files
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 19.03
2 parents 8e8ca6c + 45d8672 commit cebe170

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

components/packaging/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARCH=$(shell uname -m)
22
BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
33
DEFAULT_PRODUCT_LICENSE:=Community Engine
44
DOCKER_GITCOMMIT:=abcdefg
5-
GO_VERSION:=1.12.12
5+
GO_VERSION:=1.12.15
66
PLATFORM=Docker Engine - Community
77
SHELL:=/bin/bash
88
VERSION?=0.0.0-dev

components/packaging/deb/gen-deb-ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ origVersion=$VERSION
77
[[ $# < 2 ]] && echo 'not enough args' && exit 1
88

99
DATE_COMMAND="date"
10-
if [[ $(uname) -eq "Darwin" ]]; then
10+
if [[ $(uname) == "Darwin" ]]; then
1111
DATE_COMMAND="docker run --rm alpine date"
1212
fi
1313

components/packaging/rpm/gen-rpm-ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ VERSION=$2
66
[[ $# < 2 ]] && echo 'not enough args' && exit 1
77

88
DATE_COMMAND="date"
9-
if [[ $(uname) -eq "Darwin" ]]; then
9+
if [[ $(uname) == "Darwin" ]]; then
1010
DATE_COMMAND="docker run --rm alpine date"
1111
fi
1212

components/packaging/static/gen-static-ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ -z "$ENGINE_DIR" ] || [ -z "$VERSION" ]; then
99
fi
1010

1111
DATE_COMMAND="date"
12-
if [[ $(uname) -eq "Darwin" ]]; then
12+
if [[ $(uname) == "Darwin" ]]; then
1313
DATE_COMMAND="docker run --rm alpine date"
1414
fi
1515
GIT_COMMAND="git -C $ENGINE_DIR"

0 commit comments

Comments
 (0)