Code Review
/
ta
/
caas-helm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Go version update to 1.12.9
[ta/caas-helm.git]
/
docker-build
/
chartrepohandler
/
Dockerfile
diff --git
a/docker-build/chartrepohandler/Dockerfile
b/docker-build/chartrepohandler/Dockerfile
index
db99275
..
9c3627e
100644
(file)
--- a/
docker-build/chartrepohandler/Dockerfile
+++ b/
docker-build/chartrepohandler/Dockerfile
@@
-18,11
+18,19
@@
MAINTAINER Krisztian Lengyel <krisztian.lengyel@nokia.com>
COPY mainstart.sh /usr/bin/mainstart.sh
COPY chart-repo-handler /chart-repo-handler
ENV GOPATH /build
COPY mainstart.sh /usr/bin/mainstart.sh
COPY chart-repo-handler /chart-repo-handler
ENV GOPATH /build
+ARG go_install_dir="/usr/local/go"
+ARG go_version
+ENV PATH="$go_install_dir/bin:$PATH"
+
# TODO remake build
RUN adduser -u 150 -D -H chartrepo \
# TODO remake build
RUN adduser -u 150 -D -H chartrepo \
-&& apk add --no-cache --virtual .build-deps go gcc g++ git glide \
+&& apk add --no-cache --virtual .build-deps go gcc g++ git glide
bash
\
&& apk add --no-cache curl \
&& apk add --no-cache curl \
+&& mkdir -p $go_install_dir \
+&& curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&& cd ${go_install_dir}/src/ \
+&& ./make.bash \
&& mkdir -p $GOPATH/src \
&& mv /chart-repo-handler $GOPATH/src/chart-repo-handler \
&& cd $GOPATH/src/chart-repo-handler \
&& mkdir -p $GOPATH/src \
&& mv /chart-repo-handler $GOPATH/src/chart-repo-handler \
&& cd $GOPATH/src/chart-repo-handler \
@@
-31,6
+39,7
@@
RUN adduser -u 150 -D -H chartrepo \
&& cp chart-repo-handler /usr/bin/chart-repo-handler \
&& rm -rf $GOPATH \
&& apk del .build-deps \
&& cp chart-repo-handler /usr/bin/chart-repo-handler \
&& rm -rf $GOPATH \
&& apk del .build-deps \
+&& rm -rf $go_install_dir \
&& rm -rf /root/.glide \
&& chown -R chartrepo /usr/bin/mainstart.sh \
&& chmod +x /usr/bin/mainstart.sh
&& rm -rf /root/.glide \
&& chown -R chartrepo /usr/bin/mainstart.sh \
&& chmod +x /usr/bin/mainstart.sh