Skip to content

Commit 4782798

Browse files
authored
Merge pull request #122 from infosiftr/18.06
Update to 18.06.0-ce (GA), deprecate Edge releases
2 parents 8e5a928 + d072cf1 commit 4782798

24 files changed

+9
-421
lines changed

.architectures-lib

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,9 @@ versionChannel() {
6363
local version="$1"; shift # "17.06", "17.11-rc", etc
6464
local rcVersion="${version%-rc}"
6565

66-
local channel='edge' minorVersion
66+
local channel='stable'
6767
if [ "$rcVersion" != "$version" ]; then
6868
channel='test'
69-
elif \
70-
minorVersion="${rcVersion##*.}" \
71-
&& minorVersion="${minorVersion#0}" \
72-
&& [ "$(( minorVersion % 3 ))" = '0' ] \
73-
; then
74-
channel='stable'
7569
fi
7670

7771
echo "$channel"

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=18.06-rc
6-
- VERSION=18.05
7-
- VERSION=18.03
5+
- VERSION=18.06
86

97
install:
108
- git clone https://github.com/docker-library/official-images.git ~/official-images

18.03/git/Dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

18.05/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

18.05/dind/Dockerfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

18.05/dind/dockerd-entrypoint.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

18.05/docker-entrypoint.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

18.05/modprobe.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

18.05/release-architectures

Lines changed: 0 additions & 12 deletions
This file was deleted.

18.06-rc/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

18.06-rc/dind/Dockerfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

18.06-rc/dind/dockerd-entrypoint.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)