8000 Merge pull request #145 from infosiftr/explicit-rc · daniel4git/golang@7cffa02 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7cffa02

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#145 from infosiftr/explicit-rc
Adjust "rc" consumption to be explicit, as in other repositories
2 parents 8de30e2 + f4a3691 commit 7cffa02

File tree

11 files changed

+23
-5
lines changed

11 files changed

+23
-5
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=1.8 VARIANT=
6-
- VERSION=1.8 VARIANT=alpine
5+
- VERSION=1.8-rc VARIANT=
6+
- VERSION=1.8-rc VARIANT=alpine
77
- VERSION=1.7 VARIANT=
88
- VERSION=1.7 VARIANT=wheezy
99
- VERSION=1.7 VARIANT=alpine

‎1.8/Dockerfile renamed to ‎1.8-rc/Dockerfile

File renamed without changes.

‎1.8/alpine/Dockerfile renamed to ‎1.8-rc/alpine/Dockerfile

File renamed without changes.

‎1.8/alpine/go-wrapper renamed to ‎1.8-rc/alpine/go-wrapper

File renamed without changes.

‎1.8/alpine/no-pic.patch renamed to ‎1.8-rc/alpine/no-pic.patch

File renamed without changes.

‎1.8/go-wrapper renamed to ‎1.8-rc/go-wrapper

File renamed without changes.

‎1.8/onbuild/Dockerfile renamed to ‎1.8-rc/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.8
1+
FROM golang:1.8-rc
22

33
RUN mkdir -p /go/src/app
44
WORKDIR /go/src/app

‎1.8/windows/nanoserver/Dockerfile renamed to ‎1.8-rc/windows/nanoserver/Dockerfile

File renamed without changes.

‎1.8/windows/windowsservercore/Dockerfile renamed to ‎1.8-rc/windows/windowsservercore/Dockerfile

File renamed without changes.

‎generate-stackbrew-library.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set -eu
33

44
declare -A aliases=(
55
[1.7]='1 latest'
6+
[1.8-rc]='rc'
67
)
78

89
self="$(basename "$BASH_SOURCE")"
@@ -50,6 +51,8 @@ join() {
5051
}
5152

5253
for version in "${versions[@]}"; do
54+
rcVersion="${version%-rc}"
55+
5356
commit="$(dirCommit "$version")"
5457

5558
fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "GOLANG_VERSION" { print $3; exit }')"
@@ -58,6 +61,13 @@ for version in "${versions[@]}"; do
5861
versionAliases=(
5962
$fullVersion
6063
$version
64+
)
65+
if [ "$version" != "$rcVersion" ]; then
66+
versionAliases+=(
67+
$rcVersion
68+
)
69+
fi
70+
versionAliases+=(
6171
${aliases[$version]:-}
6272
)
6373

0 commit comments

Comments
 (0)
0