Skip to content

Commit 7d88fc5

Browse files
pskindelpskindel
authored
CAN-1905: ensure images from internet (#1205)
1 parent 31f9a8d commit 7d88fc5

File tree

7 files changed

+12
-120
lines changed

7 files changed

+12
-120
lines changed

‎applications/batch-inference/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG METRICS_IMAGE=metrics-image
2-
ARG BASE_IMAGE=python:3.6.6
2+
ARG BASE_IMAGE=python:3.6.8
33
FROM ${METRICS_IMAGE} as metrics
44
FROM ${BASE_IMAGE}
55

‎applications/experiment-service/Dockerfile

+6-51
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,6 @@
1-
FROM centos:7.4.1708 as build
1+
FROM golang:1.11.5 as build
22

3-
RUN yum clean all
4-
RUN yum update -y && yum install -y git gcc clang openssl-devel libpcap-devel libevent libevent-devel \
5-
libffi-devel libcurl-devel gcc-c++ make \
6-
pkgconfig sox-devel unzip wget vi @development rpmbuild createrepo \
7-
libmpc-devel mpfr-devel gmp-devel zlib-devel* \
8-
device-mapper device-mapper-devel btrfs-progs btrfs-progs-devel \
9-
libnl3 libnl3-devel libseccomp libseccomp-devel systemd-devel \
10-
libgudev1 libgudev1-devel pigz mercurial
11-
12-
RUN mkdir /build-process /build-output
13-
WORKDIR /build-process
14-
15-
# GO Section
16-
17-
RUN mkdir -p /build/work
18-
19-
ENV GO_VERSION=1.10.2
20-
ENV GO_ARCH=amd64
21-
ENV GO_OS=linux
22-
ENV GO_FILE=go${GO_VERSION}.${GO_OS}-${GO_ARCH}.tar.gz
23-
24-
RUN wget https://dl.google.com/go/${GO_FILE}
25-
RUN cp /build-process/${GO_FILE} /tmp/${GO_FILE}
26-
RUN tar -zvxf /tmp/${GO_FILE} -C /build && rm -rf /tmp/${GO_FILE}
27-
28-
ENV GOROOT=/build/go
29-
ENV GOPATH=/build/work
30-
ENV PATH=${PATH}:${GOROOT}/bin
31-
32-
# GODEP Section
3+
# DEP Section
334

345
RUN mkdir -p /build/dep
356

@@ -44,23 +15,6 @@ RUN chmod 0777 /build/dep/dep
4415

4516
ENV PATH=${PATH}:/build/dep/
4617

47-
# GLIDE Section
48-
49-
RUN mkdir -p /build/glide
50-
51-
ENV GLIDE_VERSION=v0.13.1
52-
ENV GLIDE_ARCH=amd64
53-
ENV GLIDE_OS=linux
54-
ENV GLIDE_FILE=glide-${GLIDE_VERSION}-${GLIDE_OS}-${GLIDE_ARCH}.tar.gz
55-
56-
RUN wget https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/${GLIDE_FILE}
57-
RUN cp ${GLIDE_FILE} /tmp/${GLIDE_FILE}
58-
RUN tar -zvxf /tmp/${GLIDE_FILE} -C /build && rm -rf /tmp/${GLIDE_FILE}
59-
RUN cp /build/${GLIDE_OS}-${GLIDE_ARCH}/glide /build/glide/glide
60-
RUN chmod 0777 /build/glide/glide
61-
62-
ENV PATH=${PATH}:/build/glide/
63-
6418
# Api-server section
6519

6620
ENV APISERVER_BUILDER_VERSION=v1.9-alpha.4
@@ -79,16 +33,17 @@ ENV PATH=${PATH}:${APISERVER_BUILDER_PATH}
7933

8034
# Experiment service section
8135

36+
RUN apt update && apt install -y make mercurial
37+
8238
ENV EXP_SVC_PATH=${GOPATH}/src/github.com/nervanasystems/carbon/applications/experiment-service
8339
RUN mkdir -p ${EXP_SVC_PATH}
8440
WORKDIR ${EXP_SVC_PATH}
8541

8642
ADD ./ ./
8743

88-
RUN yum -y install make
8944
RUN make build
9045

9146
FROM centos:7.4.1708
9247

93-
COPY --from=build /build/work/src/github.com/nervanasystems/carbon/applications/experiment-service/dist/apiserver /apiserver
94-
COPY --from=build /build/work/src/github.com/nervanasystems/carbon/applications/experiment-service/dist/controller-manager /controller-manager
48+
COPY --from=build /go/src/github.com/nervanasystems/carbon/applications/experiment-service/dist/apiserver /apiserver
49+
COPY --from=build /go/src/github.com/nervanasystems/carbon/applications/experiment-service/dist/controller-manager /controller-manager

‎applications/tensorboard-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=python:3.6.5
1+
ARG BASE_IMAGE=python:3.6.8
22
FROM ${BASE_IMAGE}
33

44
WORKDIR /app

‎applications/tf-serving-sidecar/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6.7-stretch
1+
FROM python:3.6.8
22

33
WORKDIR /app
44

‎nauta-containers/kube-batch/Dockerfile

+2-46
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,9 @@
1-
FROM centos:7.4.1708 as build
2-
3-
RUN yum clean all && \
4-
yum update -y && \
5-
yum install -y git gcc clang openssl-devel libpcap-devel libevent libevent-devel \
6-
libffi-devel libcurl-devel gcc-c++ make \
7-
pkgconfig sox-devel unzip wget vi @development rpmbuild createrepo \
8-
libmpc-devel mpfr-devel gmp-devel zlib-devel* \
9-
device-mapper device-mapper-devel btrfs-progs btrfs-progs-devel \
10-
libnl3 libnl3-devel libseccomp libseccomp-devel systemd-devel \
11-
libgudev1 libgudev1-devel pigz
1+
FROM golang:1.11.5 as build
122

133
RUN mkdir /build-process /build-output
144
WORKDIR /build-process
155

16-
# GO Section
17-
18-
RUN mkdir -p /build/work
19-
20-
ENV GO_VERSION=1.10.2
21-
ENV GO_ARCH=amd64
22-
ENV GO_OS=linux
23-
ENV GO_FILE=go${GO_VERSION}.${GO_OS}-${GO_ARCH}.tar.gz
24-
25-
RUN wget https://dl.google.com/go/${GO_FILE}
26-
RUN cp /build-process/${GO_FILE} /tmp/${GO_FILE}
27-
RUN tar -zvxf /tmp/${GO_FILE} -C /build && rm -rf /tmp/${GO_FILE}
28-
29-
ENV GOROOT=/build/go
30-
ENV GOPATH=/build/work
31-
ENV PATH=${PATH}:${GOROOT}/bin
32-
33-
# GODEP Section
6+
# DEP Section
347

358
RUN mkdir -p /build/dep
369

@@ -45,23 +18,6 @@ RUN chmod 0777 /build/dep/dep
4518

4619
ENV PATH=${PATH}:/build/dep/
4720

48-
# GLIDE Section
49-
50-
RUN mkdir -p /build/glide
51-
52-
ENV GLIDE_VERSION=v0.13.1
53-
ENV GLIDE_ARCH=amd64
54-
ENV GLIDE_OS=linux
55-
ENV GLIDE_FILE=glide-${GLIDE_VERSION}-${GLIDE_OS}-${GLIDE_ARCH}.tar.gz
56-
57-
RUN wget https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/${GLIDE_FILE}
58-
RUN cp ${GLIDE_FILE} /tmp/${GLIDE_FILE}
59-
RUN tar -zvxf /tmp/${GLIDE_FILE} -C /build && rm -rf /tmp/${GLIDE_FILE}
60-
RUN cp /build/${GLIDE_OS}-${GLIDE_ARCH}/glide /build/glide/glide
61-
RUN chmod 0777 /build/glide/glide
62-
63-
ENV PATH=${PATH}:/build/glide/
64-
6521
# Kube-batch section
6622

6723
RUN mkdir -p ${GOPATH}/src/github.com/kubernetes-sigs

‎nauta-containers/python36/Dockerfile

-18
This file was deleted.

‎tools/nauta-config.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ local_images:
158158
method: pull
159159
nauta/tensorboard-service:
160160
version: "v1.0.0"
161-
required:
162-
BASE_IMAGE: "shared/centos/python36"
161+
required: {}
163162
method: build
164163
directory: "{{ playbook_dir }}/../../applications/tensorboard-service"
165164
nauta/activity-proxy:

0 commit comments

Comments
 (0)