Fix up all base-python-minimal references and C/C++ version naming

* Let's use the concrete compiler version instead of abstract lang versions * Fix some missed filename changes
lu-project · Nov 6, 2017 · 50fd879 · 50fd879
1 parent b09e087
commit 50fd879
Show file tree

Hide file tree

Showing 27 changed files with 47 additions and 38 deletions.
diff --git a/build.py b/build.py
@@ -3,6 +3,8 @@
 import subprocess
 from pathlib import Path
 
+auto_push = False
+
 
 def run(shellcmd):
     return subprocess.run(shellcmd, shell=True, check=True)
@@ -28,11 +30,17 @@ def build_kernel(name, tag, extra_opts='', *, latest=False, squash=False):
     run(f'docker build -t lablup/kernel-{name}:{tag} {extra_opts} -f {name}/Dockerfile.{tag} {sq} {name}')
     if latest:
         run(f'docker tag lablup/kernel-{name}:{tag} lablup/kernel-{name}:latest')
+    if auto_push:
+        run(f'docker push lablup/kernel-{name}:{tag}')
+        if latest:
+            run(f'docker push lablup/kernel-{name}:latest')
 
 
 def build_common(name, tag, extra_opts=''):
     print_header(f'Building common.{name}:{tag}')
     run(f'docker build -t lablup/common-{name}:{tag} {extra_opts} -f commons/Dockerfile.{name}.{tag} commons')
+    if auto_push:
+        run(f'docker push lablup/common-{name}:{tag}')
 
 
 
@@ -50,12 +58,11 @@ def build_common(name, tag, extra_opts=''):
 # TODO: (kernel-runner update required) build_kernel('python',              '2.7-debian', squash=True, latest=True)
 
 build_kernel('git',     'alpine',     latest=True)
-build_kernel('c',       '11-alpine',  latest=True)
-build_kernel('cpp',     '14-alpine',  latest=True)
-build_kernel('java',    '9-alpine',   latest=True)
-build_kernel('java',    '8-alpine')
-build_kernel('rust',    '1.17-alpine', latest=True)
-build_kernel('go',      '1.9-alpine', latest=True)
+build_kernel('c',       'gcc6.3-alpine', latest=True)
+build_kernel('cpp',     'gcc6.3-alpine', latest=True)
+build_kernel('java',    '8-alpine',      latest=True)
+build_kernel('rust',    '1.17-alpine',   latest=True)
+build_kernel('go',      '1.9-alpine',    latest=True)
 build_kernel('go',      '1.8-alpine')
 build_kernel('haskell', 'ghc8.2-debian', latest=True)
 build_kernel('lua',     '5.3-alpine', latest=True)
@@ -109,6 +116,6 @@ def build_common(name, tag, extra_opts=''):
 build_common('tensorflow', '1.3-py36-dense-gpu')
 
 build_kernel('python-tensorflow', '1.4-py36-dense')
-build_kernel('python-tensorflow', '1.4-py36-dense-gpu', latest=True)
+build_kernel('python-tensorflow', '1.4-py36-dense-gpu')
 build_kernel('python-tensorflow', '1.3-py36-dense')
 build_kernel('python-tensorflow', '1.3-py36-dense-gpu')
diff --git a/c/Dockerfile.11-alpine b/c/Dockerfile.11-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install minimal C compile environments
 RUN apk add --no-cache build-base

diff --git a/cpp/Dockerfile.14-alpine b/cpp/Dockerfile.14-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install minimal C++ compile environments
 RUN apk add --no-cache build-base libstdc++

diff --git a/git/Dockerfile.alpine b/git/Dockerfile.alpine
@@ -1,9 +1,9 @@
-FROM lablup/kernel-base-python3-wheels:alpine as wheel-builds
+FROM lablup/kernel-base-python-wheels:3.6-alpine as wheel-builds
 RUN ls -lh /root
 
 
 # -------------------
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install Git extras and some Python packages
 RUN apk add --no-cache --virtual .sorna-deps \

diff --git a/go/Dockerfile.1.8-alpine b/go/Dockerfile.1.8-alpine
@@ -1,7 +1,7 @@
 FROM golang:1.8-alpine3.6 as go-binary
 
 
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install Go environments
 COPY --from=go-binary /usr/local/go /usr/local/

diff --git a/go/Dockerfile.1.9-alpine b/go/Dockerfile.1.9-alpine
@@ -1,7 +1,7 @@
 FROM golang:1.9-alpine3.6 as go-binary
 
 
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install Go environments
 COPY --from=go-binary /usr/local/go /usr/local/

diff --git a/haskell/Dockerfile.ghc8.2-debian b/haskell/Dockerfile.ghc8.2-debian
@@ -1,5 +1,5 @@
 # Ref: https://github.com/freebroccolo/docker-haskell/blob/master/8.2/Dockerfile
-FROM lablup/kernel-base-python3-minimal:debian
+FROM lablup/kernel-base-python-minimal:3.6-debian
 
 RUN echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu trusty main' > /etc/apt/sources.list.d/ghc.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286 && \

diff --git a/java/Dockerfile → java/Dockerfile.8-alpine b/java/Dockerfile → java/Dockerfile.8-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install Java compile environments
 # ref: https://github.com/docker-library/openjdk/blob/master/8-jdk/alpine/Dockerfile
@@ -29,3 +29,5 @@ LABEL io.sorna.features "batch query uid-match"
 
 CMD ["/home/sorna/jail", "-policy", "/home/sorna/policy.yml", \
      "/usr/local/bin/python", "-m", "ai.backend.kernel", "java"]
+
+# vim: ft=dockerfile
diff --git a/julia/Dockerfile.0.6-debian b/julia/Dockerfile.0.6-debian
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:debian
+FROM lablup/kernel-base-python-minimal:3.6-debian
 
 # Install pre-build matplotlib
 RUN install_packages gcc g++ \

diff --git a/lua/Dockerfile.5.1-alpine b/lua/Dockerfile.5.1-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 ENV LUA_VERSION 5.1
 ENV LUA_PACKAGE lua${LUA_VERSION}

diff --git a/lua/Dockerfile.5.2-alpine b/lua/Dockerfile.5.2-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 ENV LUA_VERSION 5.2
 ENV LUA_PACKAGE lua${LUA_VERSION}

diff --git a/lua/Dockerfile.5.3-alpine b/lua/Dockerfile.5.3-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 ENV LUA_VERSION 5.3
 ENV LUA_PACKAGE lua${LUA_VERSION}

diff --git a/nodejs/Dockerfile.6-alpine b/nodejs/Dockerfile.6-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 LABEL io.sorna.envs.corecount="NPROC"
 

diff --git a/php/Dockerfile.7-alpine b/php/Dockerfile.7-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install PHP 7.1
 RUN apk add --no-cache --virtual .build-deps build-base pkgconf autoconf automake \

diff --git a/python-caffe/Dockerfile.1.0-py36 b/python-caffe/Dockerfile.1.0-py36
@@ -1,4 +1,4 @@
-FROM lablup/kernel-python3:debian as caffe-builder
+FROM lablup/kernel-python:3.6-debian as caffe-builder
 
 # Build caffe
 RUN install_packages \
@@ -34,7 +34,7 @@ RUN cd /root; pip wheel "leveldb>=0.191"
 ENV PYTHONPATH=/home/sorna/caffe-install/python:.
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install Caffe dependencies
 RUN install_packages \

diff --git a/python-caffe/Dockerfile.1.0-py36-gpu b/python-caffe/Dockerfile.1.0-py36-gpu
@@ -1,4 +1,4 @@
-FROM lablup/kernel-python3:debian as caffe-builder
+FROM lablup/kernel-python:3.6-debian as caffe-builder
 
 # Build caffe
 RUN install_packages \
@@ -34,7 +34,7 @@ RUN cd /root; pip wheel "leveldb>=0.191"
 ENV PYTHONPATH=/home/sorna/caffe-install/python:.
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install Caffe dependencies
 RUN install_packages \

diff --git a/python-tensorflow/Dockerfile.1.3-py36-dense b/python-tensorflow/Dockerfile.1.3-py36-dense
@@ -1,7 +1,7 @@
 FROM lablup/common-tensorflow:1.3-py36-dense as tf-binary
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install TensorFlow and Keras
 COPY --from=tf-binary /tmp/tensorflow_pkg/tensorflow-*.whl /tmp

diff --git a/python-tensorflow/Dockerfile.1.3-py36-dense-gpu b/python-tensorflow/Dockerfile.1.3-py36-dense-gpu
@@ -2,7 +2,7 @@ FROM lablup/common-tensorflow:1.3-py36-dense-gpu as tf-binary
 FROM lablup/common-cuda:cuda8.0-cudnn6.0 as cuda-libs
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install CUDA
 COPY --from=cuda-libs /usr/local/cuda-8.0 /usr/local/cuda-8.0

diff --git a/python-tensorflow/Dockerfile.1.4-py36-dense b/python-tensorflow/Dockerfile.1.4-py36-dense
@@ -1,7 +1,7 @@
 FROM lablup/common-tensorflow:1.4-py36-dense as tf-binary
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install TensorFlow and Keras
 COPY --from=tf-binary /tmp/tensorflow_pkg/tensorflow-*.whl /tmp

diff --git a/python-tensorflow/Dockerfile.1.4-py36-dense-gpu b/python-tensorflow/Dockerfile.1.4-py36-dense-gpu
@@ -2,7 +2,7 @@ FROM lablup/common-tensorflow:1.4-py36-dense-gpu as tf-binary
 FROM lablup/common-cuda:cuda8.0-cudnn6.0 as cuda-libs
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install CUDA
 COPY --from=cuda-libs /usr/local/cuda-8.0 /usr/local/cuda-8.0

diff --git a/python-torch/Dockerfile.0.2-py36 b/python-torch/Dockerfile.0.2-py36
@@ -1,4 +1,4 @@
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install TensorFlow and Keras
 RUN pip install --no-cache-dir \

diff --git a/python-torch/Dockerfile.0.2-py36-gpu b/python-torch/Dockerfile.0.2-py36-gpu
@@ -1,7 +1,7 @@
 FROM lablup/common-cuda:cuda8.0-cudnn6.0 as cuda-libs
 
 
-FROM lablup/kernel-python3:debian
+FROM lablup/kernel-python:3.6-debian
 
 # Install CUDA
 COPY --from=cuda-libs /usr/local/cuda-8.0 /usr/local/cuda-8.0

diff --git a/python/Dockerfile.2.7-alpine b/python/Dockerfile.2.7-alpine
@@ -1,9 +1,9 @@
-FROM lablup/kernel-base-python2-wheels:alpine as wheel-builds
+FROM lablup/kernel-base-python-wheels:2.7-alpine as wheel-builds
 RUN ls -lh /root
 
 
 # -------------------
-FROM lablup/kernel-base-python2-minimal:alpine
+FROM lablup/kernel-base-python-minimal:2.7-alpine
 
 # Install system packages for wheels
 RUN apk add --no-cache --virtual .sorna-deps \

diff --git a/python/Dockerfile.3.6-alpine b/python/Dockerfile.3.6-alpine
@@ -1,9 +1,9 @@
-FROM lablup/kernel-base-python3-wheels:alpine as wheel-builds
+FROM lablup/kernel-base-python-wheels:3.6-alpine as wheel-builds
 RUN ls -lh /root
 
 
 # -------------------
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install system packages for wheels
 RUN apk add --no-cache --virtual .sorna-deps \

diff --git a/python/Dockerfile.3.6-debian b/python/Dockerfile.3.6-debian
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:debian
+FROM lablup/kernel-base-python-minimal:3.6-debian
 
 # As we mostly have "manylinux" glibc-compatible binary packaes,
 # we don't have to rebuild these!

diff --git a/r/Dockerfile.3.3-alpine b/r/Dockerfile.3.3-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install dependencies for R package installation
 RUN apk update && apk add --no-cache gcc g++ make

diff --git a/rust/Dockerfile.1.17-alpine b/rust/Dockerfile.1.17-alpine
@@ -1,4 +1,4 @@
-FROM lablup/kernel-base-python3-minimal:alpine
+FROM lablup/kernel-base-python-minimal:3.6-alpine
 
 # Install minimal Rust compile environments
 # (TODO: this is hold back to 1.17... we need to build newer version!)