Skip to content

Commit 51e3abc

Browse files
author
Matthew Fisher
committed
ref(builder): rename image/ to rootfs/
This directory is *supposed* to be a reflection of the final rootfs of the image, along with the base OS.
1 parent 368143e commit 51e3abc

32 files changed

Lines changed: 10 additions & 11 deletions

.gitignore

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ controller/.secret_key
2222
logs/
2323

2424
# local binaries, installers, and artifacts
25-
builder/Godeps/
26-
builder/image/bin/extract-domain
27-
builder/image/bin/extract-types
28-
builder/image/bin/extract-version
29-
builder/image/bin/generate-buildhook
30-
builder/image/bin/get-app-config
31-
builder/image/bin/get-app-values
32-
builder/image/bin/publish-release-controller
33-
builder/image/bin/yaml2json-procfile
25+
builder/rootfs/bin/extract-domain
26+
builder/rootfs/bin/extract-types
27+
builder/rootfs/bin/extract-version
28+
builder/rootfs/bin/generate-buildhook
29+
builder/rootfs/bin/get-app-config
30+
builder/rootfs/bin/get-app-values
31+
builder/rootfs/bin/publish-release-controller
32+
builder/rootfs/bin/yaml2json-procfile
3433
cache/image/bin/
3534
client/dist/
3635
client/makeself/

builder/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ COMPONENT = $(notdir $(repo_path))
1111
IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
1212
DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
1313
BINARIES := extract-domain extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
14-
BINARY_DEST_DIR := image/bin
14+
BINARY_DEST_DIR := rootfs/bin
1515

1616
build: check-docker
1717
for i in $(BINARIES); do \
1818
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i src/$$i.go || exit 1; \
1919
$(call check-static-binary,$(BINARY_DEST_DIR)/$$i) \
2020
done
21-
docker build -t $(IMAGE) image
21+
docker build -t $(IMAGE) rootfs
2222

2323
clean: check-docker check-registry
2424
for i in $(BINARIES); do \
File renamed without changes.

0 commit comments

Comments
 (0)