Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile-test: move to "tests"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-09 10:33:25 -07:00
parent 140374e25d
commit 20e1179fac
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -75,11 +75,11 @@ endif
build-docker-test: build-docker-test:
$(info GO_VERSION: $(GO_VERSION)) $(info GO_VERSION: $(GO_VERSION))
@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-test @sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./tests/Dockerfile
docker build \ docker build \
--tag gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ --tag gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
--file ./Dockerfile-test . --file ./tests/Dockerfile .
@mv ./Dockerfile-test.bak ./Dockerfile-test @mv ./tests/Dockerfile.bak ./tests/Dockerfile
push-docker-test: push-docker-test:
$(info GO_VERSION: $(GO_VERSION)) $(info GO_VERSION: $(GO_VERSION))

2
Dockerfile-test → tests/Dockerfile
View File

@ -15,7 +15,7 @@ RUN dnf check-update || true \
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV GOPATH /go ENV GOPATH /go
ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
ENV GO_VERSION REPLACE_ME_GO_VERSION ENV GO_VERSION 1.10.1
ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
RUN rm -rf ${GOROOT} \ RUN rm -rf ${GOROOT} \
&& curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \