From 666e1335aa5d68b20ede3360e4934907e2f02885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Jochum?= <rene@jochum.dev>
Date: Sun, 25 Sep 2022 19:23:24 +0200
Subject: [PATCH] Add CACHEBUST, upgrade router

---
 Taskfile.yml                     | 3 +++
 docker/microauth2sqld/Dockerfile | 2 ++
 go.mod                           | 2 +-
 go.sum                           | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 6dabc48..5dd3781 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -69,6 +69,7 @@ tasks:
       - podman build 
           -v "{{.BUILD_MOUNT_FOLDER_INT}}:{{.BUILD_MOUNT_FOLDER_INT}}" 
           -v "{{.VOLUME_PATH}}:/go:rw" 
+          --build-arg CACHEBUST={{.DATE}}
           --build-arg VERSION={{.VERSION}}
           --build-arg=DOCKER_IO={{.DOCKER_IO}}
           --build-arg=DOCKER_ORG_JO_MICRO={{.DOCKER_ORG_JO_MICRO}}
@@ -76,6 +77,8 @@ tasks:
           -f ./docker/microauth2sqld/Dockerfile
           .
     vars:
+      DATE:
+        sh: date -u -Iseconds
       VOLUME_PATH:
         sh: podman volume inspect jo-AUTH2_go --format "{{"{{"}}.Mountpoint{{"}}"}}"
       BUILD_MOUNT_FOLDER_INT:
diff --git a/docker/microauth2sqld/Dockerfile b/docker/microauth2sqld/Dockerfile
index 0613e99..159aba7 100644
--- a/docker/microauth2sqld/Dockerfile
+++ b/docker/microauth2sqld/Dockerfile
@@ -10,6 +10,8 @@ RUN useradd appuser
 ARG VERSION
 COPY . /code/
 WORKDIR /code
+
+ARG CACHEBUST=1
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix cgo -ldflags="-w -s -X 'jochum.dev/jo-micro/auth2/cmd/microauth2sqld/config.Version=$VERSION'" -o /usr/local/bin/microauth2sqld jochum.dev/jo-micro/auth2/cmd/microauth2sqld
 
 # STEP 2 build a small image
diff --git a/go.mod b/go.mod
index 77ceb89..7e8b6fe 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	jochum.dev/jo-micro/buncomponent v0.0.5
 	jochum.dev/jo-micro/components v0.3.0
 	jochum.dev/jo-micro/logruscomponent v0.0.4
-	jochum.dev/jo-micro/router v0.4.3
+	jochum.dev/jo-micro/router v0.4.5
 )
 
 require (
diff --git a/go.sum b/go.sum
index 91c5d5e..618be84 100644
--- a/go.sum
+++ b/go.sum
@@ -1925,6 +1925,8 @@ jochum.dev/jo-micro/router v0.4.2 h1:/nLP8rq0gM4YzL9x+o9IBofJoz0sOVLgTbwMS0ouINk
 jochum.dev/jo-micro/router v0.4.2/go.mod h1:kIxSXrTrRJ5ahMTF0on9CYCQzeEjrlK4NwHDWIywjSc=
 jochum.dev/jo-micro/router v0.4.3 h1:bhukSjECazxt00ENhz79Pb6EQUh16rHWL6dqiqueVOo=
 jochum.dev/jo-micro/router v0.4.3/go.mod h1:di9nC/mnwkrSQd/HzBH1YVl3KEL+xrQ+3ASfC3fA7Rw=
+jochum.dev/jo-micro/router v0.4.5 h1:wG1inQinS9zFaordMHPLkKBLfNpJqys3mwBH8QBYfJQ=
+jochum.dev/jo-micro/router v0.4.5/go.mod h1:l7Jf1lRXXOgi3LMqJXgMLKSpwaA59paBAZiETq5zeNI=
 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=