Code Review
/
ric-plt
/
dbaas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix DBAAS (alpine3.11) vulnerabilities found in package apk-tools
[ric-plt/dbaas.git]
/
docker
/
Dockerfile.testapp
diff --git
a/docker/Dockerfile.testapp
b/docker/Dockerfile.testapp
index
1e88a62
..
b15c772
100644
(file)
--- a/
docker/Dockerfile.testapp
+++ b/
docker/Dockerfile.testapp
@@
-25,8
+25,8
@@
RUN apt-get update && \
apt install -y redis-tools && \
apt install -y git && \
apt install -y wget && \
apt install -y redis-tools && \
apt install -y git && \
apt install -y wget && \
- wget https://
dl.google.com/go/go1.11.4
.linux-amd64.tar.gz && \
- tar -xvf go1.1
1.4
.linux-amd64.tar.gz && \
+ wget https://
golang.org/dl/go1.12.17
.linux-amd64.tar.gz && \
+ tar -xvf go1.1
2.17
.linux-amd64.tar.gz && \
mv go /usr/local && \
apt-get clean
mv go /usr/local && \
apt-get clean
@@
-35,10
+35,11
@@
COPY ./testapplication ./testapplication
# Install go testapplication
RUN export GOROOT=/usr/local/go && \
# Install go testapplication
RUN export GOROOT=/usr/local/go && \
- export
GOPATH=$HOME/Projects/Proj1
&& \
- export
PATH=$GOPATH/bin:$GOROOT/bin:$PATH
&& \
+ export
PATH=$GOROOT/bin:$PATH
&& \
+ export
GO111MODULE=on
&& \
go get github.com/go-redis/redis && \
go get github.com/go-redis/redis && \
- go build /testapplication/go/testapp.go
+ cd /testapplication/go/ && \
+ go build ./...
# Keep the container alive
ENTRYPOINT ["tail", "-f", "/dev/null"]
# Keep the container alive
ENTRYPOINT ["tail", "-f", "/dev/null"]