github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into builder-dockerfile-patch-1

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2022-07-13 03:45:28 -04:00
committed by GitHub
parent ab45435473 23341bd0c5
commit 5182638599
59 changed files with 204 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/00_dokku-standard/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core standard plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/20_events/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core events logging plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/app-json/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core app-json plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/apps/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core apps plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/builder-dockerfile/builder-build
View File

@@ -19,7 +19,7 @@ trigger-builder-dockerfile-builder-build() {
local IMAGE=$(get_app_image_name "$APP")
local DOKKU_DOCKERFILE_CACHE_BUILD=$(config_get "$APP" "DOKKU_DOCKERFILE_CACHE_BUILD")
local DOKKU_DOCKER_BUILD_OPTS=$(config_get "$APP" "DOKKU_DOCKER_BUILD_OPTS")
local DOCKER_BUILD_LABEL_ARGS=("--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.app-name=$APP" "--label=com.dokku.image-stage=build")
local DOCKER_BUILD_LABEL_ARGS=("--label=dokku" "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=build" "--label=com.dokku.builder-type=dockerfile" "--label=com.dokku.app-name=$APP")
pushd "$SOURCECODE_WORK_DIR" &>/dev/null

2
plugins/builder-dockerfile/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core builder-dockerfile plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

4
plugins/builder-herokuish/builder-build
View File

@@ -23,8 +23,8 @@ trigger-builder-herokuish-builder-build() {
local IMAGE=$(get_app_image_name "$APP")
local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
local DOKKU_APP_HOST_CACHE_DIR="$DOKKU_HOST_ROOT/$APP/cache"
local DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$APP")
local DOCKER_RUN_LABEL_ARGS=("--label=com.dokku.image-stage=build" "--label=com.dokku.app-name=$APP")
local DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL dokku=" "--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.image-stage=build" "--change" "LABEL com.dokku.builder-type=herokuish" "--change" "LABEL com.dokku.app-name=$APP")
local DOCKER_RUN_LABEL_ARGS=("--label=dokku" "--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=build" "--label=com.dokku.builder-type=herokuish" "--label=com.dokku.app-name=$APP")
local CID TAR_CID
pushd "$SOURCECODE_WORK_DIR" &>/dev/null

2
plugins/builder-herokuish/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core builder-herokuish plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/builder-null/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core builder-null plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/builder-pack/builder-build
View File

@@ -33,7 +33,7 @@ trigger-builder-pack-builder-build() {
plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR"
pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "${ENV_ARGS[@]}"
docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"
docker-image-labeler --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE"
plugn trigger post-build-pack "$APP" "$SOURCECODE_WORK_DIR"
}

2
plugins/builder-pack/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core builder-pack plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/builder/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core builder plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/buildpacks/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core buildpacks plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/certs/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core certificate management plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/checks/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core checks plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/common/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core common plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/config/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core config plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/cron/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core cron plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/docker-options/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core docker-options plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/domains/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core domains plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/enter/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core enter plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/git/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core git plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/logs/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core logs plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/network/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core network plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/nginx-vhosts/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core nginx-vhosts plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/plugin/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core plugin plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/proxy/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core proxy plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/ps/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core ps plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/registry/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core registry plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/repo/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core repo plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/resource/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core resource plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/run/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core run plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/scheduler-docker-local/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core scheduler-docker-local plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/scheduler-null/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core scheduler-null plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/scheduler/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core scheduler plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/shell/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core shell plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/ssh-keys/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core ssh-keys plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

6
plugins/storage/install
View File

@@ -5,9 +5,9 @@ set -eo pipefail
trigger-storage-install() {
declare desc="storage install trigger"
declare trigger="install"
local storage_directory="${DOKKU_LIB_ROOT}/data/storage"
mkdir -p "${storage_directory}"
chown dokku:dokku "${storage_directory}"
mkdir -p "${DOKKU_LIB_ROOT}/data/storage"
chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/storage"
STORAGE_SUDOERS_FILE="/etc/sudoers.d/dokku-storage"
local mode="0440"

2
plugins/storage/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core storage plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]

2
plugins/trace/plugin.toml
View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku core trace plugin"
version = "0.27.6"
version = "0.27.7"
[plugin.config]