diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/Makefile | 4 | ||||
| -rw-r--r-- | docker/amd64/Dockerfile.buildkit (renamed from docker/amd64/Dockerfile.buildx) | 0 | ||||
| -rw-r--r-- | docker/amd64/Dockerfile.buildkit.alpine (renamed from docker/amd64/Dockerfile.buildx.alpine) | 0 | ||||
| -rw-r--r-- | docker/arm64/Dockerfile.buildkit (renamed from docker/arm64/Dockerfile.buildx) | 0 | ||||
| -rw-r--r-- | docker/arm64/Dockerfile.buildkit.alpine (renamed from docker/arm64/Dockerfile.buildx.alpine) | 0 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.buildkit (renamed from docker/armv6/Dockerfile.buildx) | 0 | ||||
| -rw-r--r-- | docker/armv6/Dockerfile.buildkit.alpine (renamed from docker/armv6/Dockerfile.buildx.alpine) | 0 | ||||
| -rw-r--r-- | docker/armv7/Dockerfile.buildkit (renamed from docker/armv7/Dockerfile.buildx) | 0 | ||||
| -rw-r--r-- | docker/armv7/Dockerfile.buildkit.alpine (renamed from docker/armv7/Dockerfile.buildx.alpine) | 0 |
10 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 82e8527f..095c295a 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -50,7 +50,7 @@ {% else %} {% set package_arch_target_param = "" %} {% endif %} -{% if "buildx" in target_file %} +{% if "buildkit" in target_file %} {% set mount_rust_cache = "--mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry " %} {% else %} {% set mount_rust_cache = "" %} diff --git a/docker/Makefile b/docker/Makefile index 8c939cba..d7c0ab80 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -8,8 +8,8 @@ all: $(OBJECTS) %/Dockerfile.alpine: Dockerfile.j2 render_template ./render_template "$<" "{\"target_file\":\"$@\"}" > "$@" -%/Dockerfile.buildx: Dockerfile.j2 render_template +%/Dockerfile.buildkit: Dockerfile.j2 render_template ./render_template "$<" "{\"target_file\":\"$@\"}" > "$@" -%/Dockerfile.buildx.alpine: Dockerfile.j2 render_template +%/Dockerfile.buildkit.alpine: Dockerfile.j2 render_template ./render_template "$<" "{\"target_file\":\"$@\"}" > "$@" diff --git a/docker/amd64/Dockerfile.buildx b/docker/amd64/Dockerfile.buildkit index ae841026..ae841026 100644 --- a/docker/amd64/Dockerfile.buildx +++ b/docker/amd64/Dockerfile.buildkit diff --git a/docker/amd64/Dockerfile.buildx.alpine b/docker/amd64/Dockerfile.buildkit.alpine index e1a1de9b..e1a1de9b 100644 --- a/docker/amd64/Dockerfile.buildx.alpine +++ b/docker/amd64/Dockerfile.buildkit.alpine diff --git a/docker/arm64/Dockerfile.buildx b/docker/arm64/Dockerfile.buildkit index dc5620e4..dc5620e4 100644 --- a/docker/arm64/Dockerfile.buildx +++ b/docker/arm64/Dockerfile.buildkit diff --git a/docker/arm64/Dockerfile.buildx.alpine b/docker/arm64/Dockerfile.buildkit.alpine index b8fc36c1..b8fc36c1 100644 --- a/docker/arm64/Dockerfile.buildx.alpine +++ b/docker/arm64/Dockerfile.buildkit.alpine diff --git a/docker/armv6/Dockerfile.buildx b/docker/armv6/Dockerfile.buildkit index 7b9aab8a..7b9aab8a 100644 --- a/docker/armv6/Dockerfile.buildx +++ b/docker/armv6/Dockerfile.buildkit diff --git a/docker/armv6/Dockerfile.buildx.alpine b/docker/armv6/Dockerfile.buildkit.alpine index 4bced53d..4bced53d 100644 --- a/docker/armv6/Dockerfile.buildx.alpine +++ b/docker/armv6/Dockerfile.buildkit.alpine diff --git a/docker/armv7/Dockerfile.buildx b/docker/armv7/Dockerfile.buildkit index 0084526b..0084526b 100644 --- a/docker/armv7/Dockerfile.buildx +++ b/docker/armv7/Dockerfile.buildkit diff --git a/docker/armv7/Dockerfile.buildx.alpine b/docker/armv7/Dockerfile.buildkit.alpine index d29465bb..d29465bb 100644 --- a/docker/armv7/Dockerfile.buildx.alpine +++ b/docker/armv7/Dockerfile.buildkit.alpine |