[fix/tailscale] updated Dockerfile for latest release

.gitignore

@@ -66,6 +66,7 @@ apps/argocd/base/secrets/*.yaml
 test/storage/*
 !test/storage/.gitkeep
 terraform/vault/secrets/*
+terraform/**/users.csv
 !terraform/vault/secrets/test/example.json
 terraform/**/secrets.json
 terraform/**/*.info

apps/networking/tailscale/docker/run.sh

@@ -22,8 +22,7 @@ TS_EXTRA_ARGS="${EXTRA_ARGS:-}"
 TS_USERSPACE="${USERSPACE:-true}"
 TS_KUBE_SECRET="${KUBE_SECRET:-tailscale}"
 TS_SOCKET="${TS_SOCKET:-/tmp/tailscaled.sock}"
-
-HOSTNAME="${HOSTNAME:-}"
+TS_HOSTNAME="${TS_HOSTNAME:${HOSTNAME}}"
 
 set -e
 
@@ -81,6 +80,9 @@ fi
 if [[ ! -z "${TS_TAGS}" ]]; then
   UP_ARGS="--advertise-tags=${TS_TAGS} ${UP_ARGS}"
 fi
+if [[ ! -z "${TS_HOSTNAME}" ]]; then
+  UP_ARGS="--hostname=${TS_HOSTNAME} ${UP_ARGS}"
+fi
 if [[ ! -z "${TS_SSH}" ]]; then
   UP_ARGS="--ssh=${TS_SSH} ${UP_ARGS}"
 fi

tasks/vault.yaml

@@ -138,14 +138,15 @@ tasks:
         cat << EOF > apps/argocd/base/argocd-vault.yaml
         apiVersion: v1
         stringData:
+          AVP_TYPE: vault
+          AVP_AUTH_TYPE: token
           VAULT_ADDR: {{.VAULT_ADDR}}
           VAULT_TOKEN: {{.VAULT_TOKEN}}
-          AVP_AUTH_TYPE: token
-          AVP_TYPE: vault
+
+          ARGOCD_ENV_AVP_TYPE: vault
+          ARGOCD_ENV_AVP_AUTH_TYPE: token
           ARGOCD_ENV_VAULT_ADDR: {{.VAULT_ADDR}}
           ARGOCD_ENV_VAULT_TOKEN: {{.VAULT_TOKEN}}
-          ARGOCD_ENV_AVP_AUTH_TYPE: token
-          ARGOCD_ENV_AVP_TYPE: vault
         kind: Secret
         metadata:
           name: vault-configuration