Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-16 20:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: propagate arm64 build support for development builds

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-01-18 19:19:27 -05:00
parent 3f96a250a2
commit eb6a0dc71d
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common.mk
View File

@@ -28,10 +28,10 @@ clean:
find . -xtype l -delete find . -xtype l -delete
commands: **/**/commands.go commands: **/**/commands.go
go build -ldflags="-s -w" $(GO_ARGS) -o commands src/commands/commands.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o commands src/commands/commands.go
subcommands: subcommands:
go build -ldflags="-s -w" $(GO_ARGS) -o subcommands/subcommands src/subcommands/subcommands.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o subcommands/subcommands src/subcommands/subcommands.go
$(MAKE) $(SUBCOMMANDS) $(MAKE) $(SUBCOMMANDS)
subcommands/%: subcommands/%:
@@ -41,7 +41,7 @@ src-clean:
rm -rf .gitignore src vendor Makefile *.go glide.* go.sum go.mod rm -rf .gitignore src vendor Makefile *.go glide.* go.sum go.mod
triggers: triggers:
go build -ldflags="-s -w" $(GO_ARGS) -o triggers src/triggers/triggers.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o triggers src/triggers/triggers.go
$(MAKE) $(TRIGGERS) $(MAKE) $(TRIGGERS)
triggers/%: triggers/%:

5
plugins/common/Makefile
View File

@@ -1,3 +1,4 @@
GOARCH ?= amd64
TRIGGERS = triggers/app-list triggers/core-post-deploy triggers/install triggers/post-delete TRIGGERS = triggers/app-list triggers/core-post-deploy triggers/install triggers/post-delete
BUILD = prop common triggers BUILD = prop common triggers
PLUGIN_NAME = common PLUGIN_NAME = common
@@ -9,9 +10,9 @@ clean-common:
rm -rf common rm -rf common
prop: clean-prop **/**/prop.go prop: clean-prop **/**/prop.go
go build -ldflags="-s -w" $(GO_ARGS) -o prop src/prop/prop.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o prop src/prop/prop.go
common: clean-common **/**/common.go common: clean-common **/**/common.go
go build -ldflags="-s -w" $(GO_ARGS) -o common src/common/common.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o common src/common/common.go
include ../../common.mk include ../../common.mk

3
plugins/config/Makefile
View File

@@ -1,3 +1,4 @@
GOARCH ?= amd64
SUBCOMMANDS = subcommands/bundle subcommands/clear subcommands/export subcommands/get subcommands/keys subcommands/show subcommands/set subcommands/unset SUBCOMMANDS = subcommands/bundle subcommands/clear subcommands/export subcommands/get subcommands/keys subcommands/show subcommands/set subcommands/unset
TRIGGERS = triggers/config-export triggers/config-get triggers/config-get-global TRIGGERS = triggers/config-export triggers/config-get triggers/config-get-global
BUILD = commands config_sub subcommands triggers BUILD = commands config_sub subcommands triggers
@@ -7,6 +8,6 @@ clean-config_sub:
rm -rf config_sub rm -rf config_sub
config_sub: clean-config_sub **/**/config_sub.go config_sub: clean-config_sub **/**/config_sub.go
go build -ldflags="-s -w" $(GO_ARGS) -o config_sub src/config_sub/config_sub.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o config_sub src/config_sub/config_sub.go
include ../../common.mk include ../../common.mk

3
plugins/nginx-vhosts/Makefile
View File

@@ -1,3 +1,4 @@
GOARCH ?= amd64
BUILD = pagesize BUILD = pagesize
PLUGIN_NAME = nginx-vhosts PLUGIN_NAME = nginx-vhosts
@@ -5,6 +6,6 @@ clean-pagesize:
rm -rf pagesize rm -rf pagesize
pagesize: clean-pagesize **/**/pagesize.go pagesize: clean-pagesize **/**/pagesize.go
go build -ldflags="-s -w" $(GO_ARGS) -o pagesize src/pagesize/pagesize.go GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o pagesize src/pagesize/pagesize.go
include ../../common.mk include ../../common.mk