AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Feat/fireflyiii (#344)

Browse Source 
* Adding Firefly-iii opt fragment

* Adding environment variable to force creation of db

* Instructing postgres to create database

* Switching exposing default port, running create db command

* Remove grep command for postgres container

* Removing database creation on postgres container start

* Adding required App Key env variable

* Updating nginx rewriting

* Updating firefly nginx confugration traying to make it work with subdirectory

https://github.com/firefly-iii/firefly-iii/issues/2848#issuecomment-557845301

* Trying to rewrite

* Reconfiguring nginx to pass headers

* Updating docker fragment

* Last try

* Allowing firefly iii to be hosted on other domain

* Fixing docker compose env variables

* Exposing ports for external communication

* Ports exposing

* Updating firefly host reference

* Matching service name and VIRTUAL_HOST_NAME

* Getting nginx to redirect to port 8080

* update and adapt

* Adapt firefly to be with dedicated domain

* Adapt Docker file builder to support non github builds

* Make firefly init create db only if not exists + run full recommended upgrade procedure

Co-authored-by: rockstardev <rockstardev@users.noreply.github.com>
This commit is contained in:
Andrew Camilleri
2021-09-23 11:04:11 +02:00
committed by GitHub
parent 8dfd554f58
commit d09338b2e5
9 changed files with 95 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/DockerFileBuildHelper/DockerInfo.cs
View File

@@ -14,10 +14,10 @@ namespace DockerFileBuildHelper
public string GitRef { get; set; }
public bool SupportedByUs { get; set; }
public Image Image { get; internal set; }
public string RawLink { get; set; }
public string GetGithubLinkOf(string path)
{
return $"https://raw.githubusercontent.com/{GitLink.Substring("https://github.com/".Length)}/{GitRef}/{path}";
return RawLink ?? $"https://raw.githubusercontent.com/{GitLink.Substring("https://github.com/".Length)}{(GitRef is null ? string.Empty : ("/" + GitRef))}/{path}";
}
}
}

9
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -636,6 +636,15 @@ namespace DockerFileBuildHelper
dockerInfo.GitLink = "https://github.com/BlueWallet/LndHub";
dockerInfo.GitRef = $"{image.Tag.Split("@")[0]}";
break;
case "fireflyiii/core":
dockerInfo.DockerFilePath = $"Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"Dockerfile";
dockerInfo.DockerFilePathARM64v8 = $"Dockerfile";
dockerInfo.GitLink = "https://dev.azure.com/Firefly-III/_git/MainImage";
dockerInfo.RawLink = "https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true";
dockerInfo.GitRef = null;
break;
default:
if (firstTry)
{