fixes for building docker and apps

jbsmith7741 · Apr 5, 2024 · ca188d2 · ca188d2
1 parent 1868713
commit ca188d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,19 @@
 
-FROM alpine:3.15
+FROM alpine:3.19
 
 RUN apk add ca-certificates
 RUN apk add curl
 
 #confd
-ADD https://github.com/abtreece/confd/releases/download/v0.18.3/confd-v0.18.3-linux-amd64.tar.gz confd.tar.gz
+ADD https://github.com/abtreece/confd/releases/download/v0.20.0/confd-v0.20.0-linux-amd64.tar.gz confd.tar.gz
 RUN tar -xzf confd.tar.gz
 RUN mv confd /usr/local/bin/confd
 RUN chmod +x /usr/local/bin/confd
 
 #gojq
-ADD https://github.com/itchyny/gojq/releases/download/v0.12.0/gojq_v0.12.0_linux_amd64.tar.gz /tmp/jq.tar.gz
+ADD https://github.com/itchyny/gojq/releases/download/v0.12.15/gojq_v0.12.15_linux_amd64.tar.gz /tmp/jq.tar.gz
 RUN cd /tmp && tar -xzf jq.tar.gz
-RUN cp /tmp/gojq_v0.12.0_linux_amd64/gojq /usr/local/bin/jq
+RUN cp /tmp/gojq_v0.12.15_linux_amd64/gojq /usr/local/bin/jq
 RUN rm -rf /tmp/*
 
 #ll

diff --git a/Makefile b/Makefile
@@ -17,6 +17,8 @@ APPS = filewatcher sort2file deduper recap filecopy logger json2csv csv2json sql
 
 all: $(APPS) flowlord
 
+$(APPS): %: $(BLDDIR)/%
+
 $(BLDDIR)/%: clean
 	@mkdir -p $(dir $@)
 	cd apps; \
@@ -35,7 +37,7 @@ install: $(APPS)
 	for APP in $^ ; do install -m 755 ${BLDDIR}/$$APP ${DESTDIR}${BINDIR}/$$APP${EXT} ; done
 	rm -rf build
 
-docker: $(APPS)
+docker: all
 	docker build -t hydronica/task-tools:${version} .
 	docker push hydronica/task-tools:${version}
 

diff --git a/go.work.sum b/go.work.sum
@@ -1368,6 +1368,7 @@ github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9 h1:OF1IPgv+F4NmqmJ98KTjdN97Vs1JxDPB3vbmYzV2dpk=
 github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
@@ -2033,6 +2034,7 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=