Skip to content

Update to 17.04.0-ce #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2017
Merged

Update to 17.04.0-ce #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ language: bash
services: docker

env:
- VERSION=17.04-rc
- VERSION=17.04
- VERSION=17.03
- VERSION=1.13

install:
- git clone https://github.com/docker-library/official-images.git ~/official-images
Expand Down
24 changes: 0 additions & 24 deletions 17.04-rc/Dockerfile
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions 17.04-rc/dind/Dockerfile
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions 17.04-rc/dind/dockerd-entrypoint.sh
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions 17.04-rc/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions 17.04-rc/git/Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions 1.13/Dockerfile → 17.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ RUN apk add --no-cache \
openssl

ENV DOCKER_BUCKET get.docker.com
ENV DOCKER_VERSION 1.13.1
ENV DOCKER_SHA256 97892375e756fd29a304bd8cd9ffb256c2e7c8fd759e12a55a6336e15100ad75
ENV DOCKER_VERSION 17.04.0-ce
ENV DOCKER_SHA256 c52cff62c4368a978b52e3d03819054d87bcd00d15514934ce2e0e09b99dd100

RUN set -x \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
Expand Down
2 changes: 1 addition & 1 deletion 1.13/dind/Dockerfile → 17.04/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker:1.13
FROM docker:17.04

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN apk add --no-cache \
Expand Down
0 1.13/dind/dockerd-entrypoint.sh → 17.04/dind/dockerd-entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 1.13/docker-entrypoint.sh → 17.04/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.13/git/Dockerfile → 17.04/git/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker:1.13
FROM docker:17.04

RUN apk add --no-cache \
git \
Expand Down
6 changes: 3 additions & 3 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ set -eu

declare -A aliases=(
# https://blog.docker.com/2017/03/docker-enterprise-edition/
[17.03]='17 latest stable'
#[17.04]='17 latest edge'
[17.04-rc]='rc'
[17.03]='stable'
[17.04]='17 latest edge'
[17.05-rc]='rc'
)

self="$(basename "$BASH_SOURCE")"
Expand Down