Skip to content

Commit db36c30

Browse files
committedAug 22, 2019
Docker image is not builded using local source
Former-commit-id: a0b551e [formerly d980376] Former-commit-id: 10a98a2
1 parent de009d4 commit db36c30

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed
 

‎.dockerignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
storage
44
!storage
55
**deploy
6-
**workload
76
**prometheus
8-
**/.git
7+
.git/modules
98
**/.terraform
109
c-deps/jemalloc
1110
c-deps/libs

‎Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,18 @@ RUN git clone --depth 1 -b ${BRANCH} ${REPO} . &&\
3232
./builddeps.sh
3333

3434
FROM golang:1.12.5
35-
# Allow cloning custom repo & branch for testing
36-
ARG QED_REPO=https://github.com/bbva/qed.git
37-
ARG QED_REPO_BRANCH=master
3835
ARG BUILD_META=rc1
3936

4037
ENV GO111MODULE=on
4138
ENV CGO_LDFLAGS_ALLOW='.*'
42-
ENV REPO=${QED_REPO}
43-
ENV BRANCH=${QED_REPO_BRANCH}
4439

4540
WORKDIR /go/src/github.com/bbva/qed
4641

4742
# Copy C deps form builder container
4843
COPY --from=0 /go/src/github.com/bbva/qed/c-deps /tmp/c-deps
4944

50-
# This step acts as cache to avoid recompiling when Go code changes.
51-
RUN git clone --depth 1 -b ${BRANCH} ${REPO} .
45+
# Copy current source
46+
COPY ./ .
5247

5348
# Download QED dependencies
5449
RUN go mod download

0 commit comments

Comments
 (0)