Merge pull request #264 from jose-bigio/backport_alpine

Update Dockerfile base images to alpine:3.7
projectcalico · May 30, 2018 · e3dfeb8 · e3dfeb8
2 parents 3cb8ce8 + 7f9350a
commit e3dfeb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM alpine:3.5
+FROM alpine:3.7
 LABEL maintainer "Casey Davenport <[email protected]>" 
 
 ADD dist/kube-controllers-linux-amd64 /usr/bin/kube-controllers

diff --git a/Dockerfile-ppc64le b/Dockerfile-ppc64le
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM ppc64le/alpine:3.6
+FROM ppc64le/alpine:3.7
 LABEL maintainer "Casey Davenport <[email protected]>"
 
 ADD dist/kube-controllers-linux-ppc64le /usr/bin/kube-controllers