Skip to content

Commit 484a96a

Browse files
joshuabairdmarcofranssen
authored andcommitted
Fix PHONY.
Signed-off-by: Josh Baird <[email protected]>
1 parent 72d7e04 commit 484a96a

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,22 +117,25 @@ run: manifests generate fmt vet ## Run a controller from your host.
117117
go run cmd/fluent-manager/main.go
118118

119119
# Build amd64/arm64 Fluent Operator container image
120+
.PHONY: build-op
120121
build-op:
121122
docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG}
122123

123124
# Build amd64/arm64 Fluent Bit container image
125+
.PHONY: build-fb
124126
build-fb: prepare-build
125127
docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG}
126128

129+
.PHONY: build-fb-debug
127130
build-fb-debug: prepare-build
128131
docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile.debug . -t ${FB_IMG_DEBUG}
129132

130133
# Build all amd64 docker images
131-
PHONY: build-amd64
134+
.PHONY: build-amd64
132135
build-amd64: build-op-amd64 build-fb-amd64 build-fd-amd64
133136

134137
# Build all arm64 docker images
135-
PHONY: build-arm64
138+
.PHONY: build-arm64
136139
build-arm64: build-op-arm64 build-fb-arm64 build-fd-arm64
137140

138141
# Build amd64 Fluent Operator container image
@@ -141,32 +144,30 @@ build-op-amd64:
141144
docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG}
142145

143146
# Build arm64 Fluent Operator container image
144-
PHONY: build-op-amd64
147+
.PHONY: build-op-amd64
145148
build-op-amd64:
146149
docker build --platform=linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG}
147150

148151
# Build amd64 Fluent Bit container image
152+
.PHONY: build-fb-amd64
149153
build-fb-amd64:
150154
docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG}
151155

152156
# Build arm64 Fluent Bit container image
153-
PHONY: build-fb-arm64
157+
.PHONY: build-fb-arm64
154158
build-fb-arm64:
155159
docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG}
156160

157161
# Build amd64 Fluentd container image
162+
.PHONY: build-fd-amd64
158163
build-fd-amd64:
159164
docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG}
160165

161166
# Build arm64 Fluentd container image
162-
PHONY: build-fd-arm64
167+
.PHONY: build-fd-arm64
163168
build-fd-arm64:
164169
docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG}
165170

166-
# Use docker buildx to build arm64 Fluentd container image
167-
build-fd-arm64: prepare-build
168-
docker buildx build --push --platform linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick . -t ${FD_IMG}${ARCH} --build-arg ${FD_IMG_BASE} --build-arg ${FD_IMG_BASE_TAG}
169-
170171
# Prepare for arm64 building
171172
prepare-build:
172173
cmd/fluent-watcher/hooks/post-hook.sh

0 commit comments

Comments
 (0)