Skip to content

Commit

Permalink
Prepare 0.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
sebt3 committed Jan 25, 2024
1 parent e2bdc5d commit 2dffa31
Show file tree
Hide file tree
Showing 18 changed files with 291 additions and 309 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vynil"
version = "0.2.1"
version = "0.2.6"
authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
edition = "2021"
license = " BSD-3-Clause"
Expand Down
2 changes: 1 addition & 1 deletion agent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.2.3"
version = "0.2.6"
authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
edition = "2021"
license = " BSD-3-Clause"
Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& chmod 755 /usr/local/bin/kubectl /usr/local/bin/helm \
&& mkdir -p /var/lib/vynil/keys /nonexistent \
&& chown -R nobody:nogroup /var/lib/vynil /nonexistent \
&& chmod 750 /var/lib/vynil /nonexistent \
&& chmod 770 /var/lib/vynil /nonexistent \
&& chmod 700 /var/lib/vynil/keys
# Use the intermediary image to download the most used providers for runtime caching purpose
FROM middle as downloader
Expand Down
22 changes: 13 additions & 9 deletions agent/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,32 @@ terraform {
version = "~> 0.9.2"
}
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = "~> 2.20.0"
}
kubectl = {
source = "gavinbunney/kubectl"
source = "gavinbunney/kubectl"
version = "~> 1.14.0"
}
authentik = {
source = "goauthentik/authentik"
source = "goauthentik/authentik"
version = "~> 2023.5.0"
}
postgresql = {
source = "cyrilgdn/postgresql"
source = "cyrilgdn/postgresql"
version = "~> 1.19.0"
}
http = {
source = "hashicorp/http"
mysql = {
source = "petoju/mysql"
version = "~> 3.0.43"
}
http = {
source = "hashicorp/http"
version = "~> 3.3.0"
}
restapi = {
source = "Mastercard/restapi"
restapi = {
source = "Mastercard/restapi"
version = "~> 1.18.0"
}
}
}
}
6 changes: 3 additions & 3 deletions agent/src/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ pub async fn clone(target: &PathBuf, client: kube::Client, dist: &client::Distri
let mut branch_manage: String = "".to_owned();
if dist.branch() != "" {
branch_manage.push_str(&format!(
"git checkout {branch}; git reset --hard origin/{branch}; git pull",
"git switch {branch}; git reset --hard origin/{branch}",
branch = dist.branch()
))
} else {
branch_manage.push_str("git pull")
branch_manage.push_str("RBRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'); git switch ${RBRANCH}; git reset --hard origin/${RBRANCH}")
}
shell::run_log(&format!(
"set -e ; cd {target} ; git remote set-url origin {url} ; {command}",
"set -e ; cd {target} ; git remote set-url origin {url} ; git fetch ; {command}",
target = target.display(),
url = url,
command = branch_manage
Expand Down
2 changes: 1 addition & 1 deletion dist/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dist"
version = "0.2.2"
version = "0.2.6"
authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
edition = "2021"
license = " BSD-3-Clause"
Expand Down
Loading

0 comments on commit 2dffa31

Please sign in to comment.