Skip to content

Commit

Permalink
Fix DockerFile (#141)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbsmith7741 authored Jan 14, 2021
1 parent 9d1b380 commit 1076403
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
COPY build/linux/ /usr/bin/
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)/%

Expand Down

0 comments on commit 1076403

Please sign in to comment.