diff --git a/Dockerfile b/Dockerfile index 07b30302..ef9911c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk add ca-certificates RUN apk add curl #confd -ADD https://github.com/jbsmith7741/confd/releases/download/v0.16.0-vault/confd-0.16.0-vault-darwin-amd64 /usr/bin/confd +ADD https://github.com/jbsmith7741/confd/releases/download/v0.16.0-vault/confd-0.16.0-vault-linux-amd64 /usr/bin/confd RUN chmod +x /usr/bin/confd #gojq @@ -18,4 +18,4 @@ RUN rm -rf /tmp/* RUN echo -e "#!/bin/sh \n ls -Alhp \$1" > /usr/bin/ll RUN chmod +x /usr/bin/ll -COPY build/* /usr/bin/ \ No newline at end of file +COPY build/linux/ /usr/bin/ \ No newline at end of file diff --git a/Makefile b/Makefile index 0446432d..62ff0e92 100644 --- a/Makefile +++ b/Makefile @@ -10,14 +10,14 @@ ifeq (${GOOS},windows) EXT=.exe endif -APPS = backloader crontask files retry filewatcher nop sort2file deduper batcher http recap filecopy logger stats json2csv flowlord csv2json sql-load sql-read bq-load +APPS = backloader crontask files retry filewatcher sort2file deduper batcher http recap filecopy logger stats json2csv flowlord csv2json sql-load sql-read bq-load transform all: $(APPS) $(BLDDIR)/%: clean @mkdir -p $(dir $@) - GOOS=linux go build ${GOFLAGS} -o $@ ./apps/*/$* - go build ${GOFLAGS} -o ${BLDDIR}/local/$(@F) ./apps/*/$* + GOOS=linux go build ${GOFLAGS} -o ${BLDDIR}/linux/$(@F) ./apps/*/$* + go build ${GOFLAGS} -o ${BLDDIR}/$(@F) ./apps/*/$* $(APPS): %: $(BLDDIR)/%