Compare commits
2 Commits
b6c5a50148
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
83cf48b2a9
|
|||
|
fc9f34939b
|
@@ -6,9 +6,23 @@ group "default" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
target "docker-metadata-action" {}
|
target "docker-metadata-action" {}
|
||||||
|
target "cache" {
|
||||||
|
cache-from = [
|
||||||
|
{
|
||||||
|
type = "gha",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
cache-to = [
|
||||||
|
{
|
||||||
|
type = "gha",
|
||||||
|
mode = "max"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
target "authelia-controller" {
|
target "authelia-controller" {
|
||||||
inherits = ["docker-metadata-action"]
|
inherits = ["docker-metadata-action", "cache"]
|
||||||
context = "./"
|
context = "./"
|
||||||
dockerfile = "Dockerfile"
|
dockerfile = "Dockerfile"
|
||||||
tags = [for tag in target.docker-metadata-action.tags : "${TAG_BASE}:${tag}"]
|
tags = [for tag in target.docker-metadata-action.tags : "${TAG_BASE}:${tag}"]
|
||||||
@@ -16,6 +30,7 @@ target "authelia-controller" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
target "manifests" {
|
target "manifests" {
|
||||||
|
inherits = ["cache"]
|
||||||
context = "./"
|
context = "./"
|
||||||
dockerfile = "Dockerfile"
|
dockerfile = "Dockerfile"
|
||||||
target = "manifests"
|
target = "manifests"
|
||||||
|
|||||||
@@ -45,11 +45,11 @@ pub struct AccessControlRuleSpec {
|
|||||||
#[derive(Serialize, Deserialize, Clone, Debug, Hash)]
|
#[derive(Serialize, Deserialize, Clone, Debug, Hash)]
|
||||||
struct AccessControl {
|
struct AccessControl {
|
||||||
rules: Vec<AccessControlRuleSpec>,
|
rules: Vec<AccessControlRuleSpec>,
|
||||||
|
default_policy: AccessPolicy,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug, Hash)]
|
#[derive(Serialize, Deserialize, Clone, Debug, Hash)]
|
||||||
struct TopLevel {
|
struct TopLevel {
|
||||||
default_policy: AccessPolicy,
|
|
||||||
access_control: AccessControl,
|
access_control: AccessControl,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,13 +68,15 @@ impl AccessControlRule {
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let top = TopLevel {
|
let top = TopLevel {
|
||||||
// TODO: Make sure configurable?
|
access_control: AccessControl {
|
||||||
default_policy: if rules.is_empty() {
|
// TODO: Make sure configurable?
|
||||||
AccessPolicy::OneFactor
|
default_policy: if rules.is_empty() {
|
||||||
} else {
|
AccessPolicy::OneFactor
|
||||||
AccessPolicy::Deny
|
} else {
|
||||||
|
AccessPolicy::Deny
|
||||||
|
},
|
||||||
|
rules,
|
||||||
},
|
},
|
||||||
access_control: AccessControl { rules },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let contents = BTreeMap::from([(
|
let contents = BTreeMap::from([(
|
||||||
|
|||||||
Reference in New Issue
Block a user