Retropex/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/Retropex/btcpayserver-docker.git synced 2025-05-13 05:20:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker-compose-generator should include docker-compose install image

Browse Source
This commit is contained in:
nicolas.dorier 2024-01-30 14:22:44 +09:00
parent 27b7e0a43c
commit 40f5ea5fe2
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose-generator/src/DockerComposeDefinition.cs
View File

@ -169,7 +169,7 @@ namespace DockerGenerator
PostProcess(output); PostProcess(output);
var dockerImages = ((YamlMappingNode)output["services"]).Children.Select(kv => kv.Value["image"].ToString()).ToList(); var dockerImages = ((YamlMappingNode)output["services"]).Children.Select(kv => kv.Value["image"].ToString()).ToList();
dockerImages.Add("btcpayserver/docker-compose:1.28.6"); dockerImages.Add("docker/compose-bin:v2.23.3");
dockerImages.Add("btcpayserver/docker-compose-generator:latest"); dockerImages.Add("btcpayserver/docker-compose-generator:latest");
StringBuilder pullImageSh = new StringBuilder(); StringBuilder pullImageSh = new StringBuilder();
pullImageSh.Append($"#!/bin/bash\n\n"); pullImageSh.Append($"#!/bin/bash\n\n");

1
helpers.sh
View File

@ -143,6 +143,7 @@ docker_compose_set_plugin() {
} }
docker_compose_update() { docker_compose_update() {
# If you change this, update also docker-compose-generator/src/DockerComposeDefinition.cs and the dcg-latest branch
compose_version="2.23.3" compose_version="2.23.3"
if ! [[ -x "$(command -v docker-compose)" ]] || [[ "$(docker-compose version --short)" != "$compose_version" ]]; then if ! [[ -x "$(command -v docker-compose)" ]] || [[ "$(docker-compose version --short)" != "$compose_version" ]]; then
if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then