Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Add dependency on shared tools to build-image target (ref #40) #43

Merged
merged 2 commits into from
Sep 3, 2020
+3 −1
Merged

Add dependency on shared tools to build-image target (ref #40) #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
884dffd
Add dependency on shared tools to build-image target (ref #40)
Aug 28, 2020
97e64b5
Add conditional bin/tools to Dockerfile (closes #40)
Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ WORKDIR /go/src/code.cloudfoundry.org/quarks-secret

# Copy the rest of the source code and build
COPY . .
RUN [ -f tools/quarks-utils/bin/include/versioning ] || \
bin/tools
RUN bin/build && \
cp -p binaries/quarks-secret /usr/local/bin/quarks-secret

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test-cluster: tools
lint: tools
$(QUARKS_UTILS)/bin/lint

build-image:
build-image: tools
bin/build-image

.PHONY: tools
Expand Down