feat: ensure referenced images get updated by dependabot
Dokku uses a few external images for various bits of functionality, but these must be manually updated every so often due to being referenced in code. By moving the references to Dockerfiles, we can take advantage of dependabot to issue automatic PRs when they are out of date.
This commit is contained in:
1 parent
808b27bf8f
commit
1c0bd39d42
14 files changed
+63
-9
No files matched your search
@@ -141,6 +141,41 @@ updates:
|
|||||||
open-pull-requests-limit: 2
|
open-pull-requests-limit: 2
|
||||||
labels:
|
labels:
|
||||||
- "type: dependencies"
|
- "type: dependencies"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/plugins/caddy-vhosts"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
labels:
|
||||||
|
- "type: dependencies"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/plugins/haproxy-vhosts"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
labels:
|
||||||
|
- "type: dependencies"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/plugins/logs"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
labels:
|
||||||
|
- "type: dependencies"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/plugins/openresty-vhosts"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
labels:
|
||||||
|
- "type: dependencies"
|
||||||
|
- package-ecosystem: "docker"
|
||||||
|
directory: "/plugins/traefik-vhosts"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
labels:
|
||||||
|
- "type: dependencies"
|
||||||
- package-ecosystem: bundler
|
- package-ecosystem: bundler
|
||||||
directory: "/tests/apps/ruby"
|
directory: "/tests/apps/ruby"
|
||||||
schedule:
|
schedule:
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
FROM lucaslorentz/caddy-docker-proxy:2.8
|
||||||
@@ -46,7 +46,7 @@ fn-caddy-template-compose-file() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn-caddy-image() {
|
fn-caddy-image() {
|
||||||
fn-plugin-property-get-default "caddy" "--global" "image" "lucaslorentz/caddy-docker-proxy:2.8"
|
fn-plugin-property-get-default "caddy" "--global" "image" "$(grep "FROM" "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/Dockerfile" | awk '{print $2}')"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn-caddy-letsencrypt-email() {
|
fn-caddy-letsencrypt-email() {
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
FROM byjg/easy-haproxy:4.3.0
|
||||||
@@ -44,7 +44,7 @@ fn-haproxy-template-compose-file() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn-haproxy-image() {
|
fn-haproxy-image() {
|
||||||
fn-plugin-property-get-default "haproxy" "--global" "image" "byjg/easy-haproxy:4.3.0"
|
fn-plugin-property-get-default "haproxy" "--global" "image" "$(grep "FROM" "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/Dockerfile" | awk '{print $2}')"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn-haproxy-log-level() {
|
fn-haproxy-log-level() {
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
FROM timberio/vector:0.35.X-debian
|
||||||
@@ -121,6 +121,17 @@ func startVectorContainer(vectorImage string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getComputedVectorImage() string {
|
||||||
|
return common.PropertyGetDefault("logs", "--global", "vector-image", getDefaultVectorImage())
|
||||||
|
}
|
||||||
|
|
||||||
|
// getDefaultVectorImage returns the default image used for the vector container
|
||||||
|
func getDefaultVectorImage() string {
|
||||||
|
contents := strings.TrimSpace(VectorDockerfile)
|
||||||
|
parts := strings.SplitN(contents, " ", 2)
|
||||||
|
return parts[1]
|
||||||
|
}
|
||||||
|
|
||||||
func stopVectorContainer() error {
|
func stopVectorContainer() error {
|
||||||
if !common.IsComposeInstalled() {
|
if !common.IsComposeInstalled() {
|
||||||
return errors.New("Required docker compose plugin is not installed")
|
return errors.New("Required docker compose plugin is not installed")
|
||||||
@@ -159,7 +170,7 @@ func stopVectorContainer() error {
|
|||||||
data := vectorTemplateData{
|
data := vectorTemplateData{
|
||||||
DokkuLibRoot: dokkuLibRoot,
|
DokkuLibRoot: dokkuLibRoot,
|
||||||
DokkuLogsDir: dokkuLogsDir,
|
DokkuLogsDir: dokkuLogsDir,
|
||||||
VectorImage: VectorImage,
|
VectorImage: getComputedVectorImage(),
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := tmpl.Execute(tmpFile, data); err != nil {
|
if err := tmpl.Execute(tmpFile, data); err != nil {
|
||||||
|
|||||||
@@ -25,8 +25,11 @@ var (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// VectorImage contains the default vector image to run
|
// VectorDockerfile is the contents of the default Dockerfile
|
||||||
const VectorImage = "timberio/vector:0.35.X-debian"
|
// containing the version of vector Dokku uses
|
||||||
|
//
|
||||||
|
//go:embed Dockerfile
|
||||||
|
var VectorDockerfile string
|
||||||
|
|
||||||
// VectorDefaultSink contains the default sink in use for vector log shipping
|
// VectorDefaultSink contains the default sink in use for vector log shipping
|
||||||
const VectorDefaultSink = "blackhole://?print_interval_secs=1"
|
const VectorDefaultSink = "blackhole://?print_interval_secs=1"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ func reportGlobalMaxSize(appName string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func reportVectorGlobalImage(appName string) string {
|
func reportVectorGlobalImage(appName string) string {
|
||||||
return common.PropertyGetDefault("logs", "--global", "vector-image", VectorImage)
|
return getComputedVectorImage()
|
||||||
}
|
}
|
||||||
|
|
||||||
func reportGlobalVectorSink(appName string) string {
|
func reportGlobalVectorSink(appName string) string {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ func CommandVectorStart(vectorImage string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if vectorImage == "" {
|
if vectorImage == "" {
|
||||||
vectorImage = common.PropertyGetDefault("logs", "--global", "vector-image", VectorImage)
|
vectorImage = common.PropertyGetDefault("logs", "--global", "vector-image", getComputedVectorImage())
|
||||||
}
|
}
|
||||||
|
|
||||||
common.LogVerbose("Starting vector container")
|
common.LogVerbose("Starting vector container")
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
FROM dokku/openresty-docker-proxy:0.6.0
|
||||||
@@ -112,7 +112,7 @@ fn-openresty-hsts-is-enabled() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn-openresty-image() {
|
fn-openresty-image() {
|
||||||
fn-plugin-property-get-default "openresty" "--global" "image" "dokku/openresty-docker-proxy:0.6.0"
|
fn-plugin-property-get-default "openresty" "--global" "image" "$(grep "FROM" "$PLUGIN_AVAILABLE_PATH/openresty-vhosts/Dockerfile" | awk '{print $2}')"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn-openresty-letsencrypt-email() {
|
fn-openresty-letsencrypt-email() {
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
FROM traefik:v2.10
|
||||||
@@ -76,7 +76,7 @@ fn-traefik-dashboard-enabled() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn-traefik-image() {
|
fn-traefik-image() {
|
||||||
fn-plugin-property-get-default "traefik" "--global" "image" "traefik:v2.10"
|
fn-plugin-property-get-default "traefik" "--global" "image" "$(grep "FROM" "$PLUGIN_AVAILABLE_PATH/traefik-vhosts/Dockerfile" | awk '{print $2}')"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn-traefik-letsencrypt-email() {
|
fn-traefik-letsencrypt-email() {
|
||||||
|
|||||||
Reference in new issue
Block a user