A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(rexctl): know every shipped stack file on takeover (#3595)
Hampus87ed100a77bd
diff --git a/.github/workflows/rexctl.yaml b/.github/workflows/rexctl.yamlindex 99e2b6253..4fe5057f4 100644--- a/.github/workflows/rexctl.yaml+++ b/.github/workflows/rexctl.yaml@@ -71,6 +71,12 @@ jobs:scripts/gen-adminapi.shgit diff --exit-code -- internal/adminapi+ - name: shipped file hashes are current+ run: |+ set -euo pipefail+ go run ./internal/instance/shipped+ git diff --exit-code -- internal/instance/shipped.json+- name: command reference is currentrun: |set -euo pipefaildiff --git a/fluxer_rexctl/internal/instance/adopt.go b/fluxer_rexctl/internal/instance/adopt.goindex b2efa55be..f0c2edb40 100644--- a/fluxer_rexctl/internal/instance/adopt.go+++ b/fluxer_rexctl/internal/instance/adopt.go@@ -7,7 +7,9 @@ import ("bytes""context""crypto/sha256"+ _ "embed""encoding/hex"+ "encoding/json""errors""fmt""io/fs"@@ -17,6 +19,7 @@ import ("regexp""slices""strings"+ "sync""github.com/fluxerapp/fluxer/fluxer_rexctl/internal/envfile""github.com/fluxerapp/fluxer/fluxer_rexctl/internal/stack"@@ -527,24 +530,27 @@ func overlayFor(path, dir string) string {return ""}+//go:embed shipped.json+var shippedJSON []byte++var shippedHashes = sync.OnceValue(func() map[string][]string {+ var known map[string][]string+ if err := json.Unmarshal(shippedJSON, &known); err != nil {+ panic(err)+ }+ return known+})++func ShippedHash(data []byte) string {+ sum := sha256.Sum256(normalizeLF(data))+ return hex.EncodeToString(sum[:])+}+func isShipped(name string, data []byte) bool {- data = normalizeLF(data)if name == stack.ComposeFile {- data = stack.UnpinImages(data)- }- sum := sha256.Sum256(data)- h := hex.EncodeToString(sum[:])- if slices.Contains(shippedHashes[name], h) {- return true- }- if name == ".env.example" {- return string(data) == BundleEnv()- }- current, err := fs.ReadFile(stack.Embedded().Files, name)- if err != nil {- return false+ data = stack.UnpinImages(normalizeLF(data))}- return bytes.Equal(normalizeLF(current), data)+ return slices.Contains(shippedHashes()[name], ShippedHash(data))}func normalizeLF(data []byte) []byte {diff --git a/fluxer_rexctl/internal/instance/adopt_known.go b/fluxer_rexctl/internal/instance/shipped.jsonsimilarity index 83%rename from fluxer_rexctl/internal/instance/adopt_known.gorename to fluxer_rexctl/internal/instance/shipped.jsonindex c27fd4ad8..63ebe0330 100644--- a/fluxer_rexctl/internal/instance/adopt_known.go+++ b/fluxer_rexctl/internal/instance/shipped.json@@ -1,17 +1,128 @@-// SPDX-License-Identifier: AGPL-3.0-or-later--package instance--var shippedHashes = map[string][]string{- "docker-compose.yml": {+{+ ".env.example": [+ "013e26017b51e7310d7e044090b50d0b4ae33cd1d91f0ac380a0a6783d9edab1",+ "0b718956b039a8d8402bd9c6102322fb273159f2834509fdf23a95459c7537b9",+ "0e54ce3bfec7340d76214240c4bb9dc8dd9a33dc9ce57eff70d8d15f909cf7ab",+ "1263f66b22074f380e55198a32d759ae5196bb9b44d8a62473c6f41dfb770905",+ "1335c63f715dab6fa0b77d012aead1343ea027e8e047357e2c1df0b653eac7e8",+ "148f6a5506fb6a147668c4190690e141cb931b1f93d0a0d5cd459aaf2d3d6dfe",+ "1599f1c87d97dbca696a72fd7b7929d467a070bbe037ccc3944abf3ff725f7fd",+ "1c2224572db81239f4500d051dea92aa195338d90085423c0be53f8ac70d8162",+ "1f1f7d647217b224ab8ca7e28ab656eeaf18a3fa2dc125ab6e5a6c9f8242fa5b",+ "29f53f3e7053c764e3611885708fcff47ae1a8940f47d950924f989b6724591a",+ "2b23ac88751a5e043aa48b14d1bc54336c0fca352f98825079eedb270a388b31",+ "2bea98e5ef69a0689e0a30146b2ce3666bd9f79f3141a67b564365e2d61af2a9",+ "323db63ebf2cb5da13e28eb04ecc9ccb01c9ce7617e268d3cb190099a3928c23",+ "342d21846f0e0c3a97097910aa19b77d8169263c679f9d66619744bf6bf9b2c7",+ "385846c96b53d4087921ec009ed015228d705cb84375b5b194e8255414b264a7",+ "38eac49e5649a4520d03973c8bc2b1517a8a54a609305588d273124fb87ff943",+ "39d9609d5fcb2c4df68267ea879600367c0a4dc261b056e005b1504b30f207d7",+ "3c7c86d97879b3783cd02dc54bba1457506f3d13317f02d0f24dc520ea30b51e",+ "455e8fa8321e7feeb2eecec376c58e6d9b55fec7b411d575fd47e72e3a6591b7",+ "48387bf3cad43d59021a54e194a57536ab29b902a1391ad960c5155003023cdd",+ "4c2e09384626a1cd1db2bedfb8407a511dd791209b2d3126f9c9eb74e2712c4f",+ "4d728275b94de079eedc55f908959802d481d760105d091ce3e11e86fd710298",+ "4d9e1f3f1a8edca1792943e15ebac5ae4f811536e86c0ff2e496bd1c4a1a1ea8",+ "4e21e02f2387bad78036fae1584b4e2df50026a7dcb9930a8649c4315e867997",+ "4e8ffd24b228fba269cff75b2cc8968e9a461723522117065e5edf83b3c5029c",+ "553a22ead3ee4364f995f9d9e3bb548ceee12f74657b6122cb0a199409ae02ed",+ "571f2af0a08de9a0d674e12e2afb77e572c2f0d7ec5fec8b7a69e7425a45a430",+ "5893d91877c7d96188c071dfd6e76976c10a2ed759c16520c5685068b9edf5d2",+ "58b4077b8d302e31f65e46e0e811a551634afded9d4642166b722a1289c22168",+ "5beb16eced4c5420c08c2972f13d80b6976e6d3aa5301f11d4cdf3b6fc74e078",+ "6188588df12b426670119483c24d0b2a3182e28c7c1d6bed241d50323dcd9439",+ "657789086500da432901c143ec001dc46fa125aa5b77d01548ff82065d8fe457",+ "6a946f39a24f77084ea805342984d635f3082ce8e1c23ab4fc17ba8de38886b5",+ "6b19e20d94980710724bd400104498c87def9bad5f3032a56c7f09fcf9e1b9b3",+ "6fae7995d47c43a00bd0107ff7b60e0d1e000768dc4b38c34d3e3a0d2a6f8bb3",+ "727d5063ed2c959932d7721d8a806f77852cfb017b2fd3f981e01f31c136c057",+ "73faca6872d91a8f24a71efde33307aef8a3559241851bdc703ce0c4b3ce80ab",+ "75eaee5650ddd1c9af5d414440be8f7736df86ee4556827620a681627a9d1fc8",+ "762fdb27709acc69b7f9f6032476818641a5aeda6516481e5c93080cff3419cb",+ "78740c67acc541e8ae2432defbf3df21c548a895e2aee070052541d0fdbe533a",+ "78c81c9bc7b1715189783331824a60fcda365a26a52f3aaeb7209913735a9261",+ "7a020c862ad7a0d49664afc66c90b8f77e33fa4fd0282704fc8805b955e45b65",+ "7ab3cc0b7b2018ba02080d5ebea62ac60c88744b5154c1d6460a837bd708f222",+ "7d5820c1f0511ce9f9fa1c556c5c91403b709432167d23f2745989ecbc5f2824",+ "8017d631d7d6cca17defbece31a06283461965852f00afd8ad1dc7da88eccf45",+ "8ef9eb799431fb64b29f0eb8f62516ad33577ef0cf31e7d0d1f2285ab30f3712",+ "92bbf72022a7e25f72f93bc95e25ce7056249a9fc4cb4838c34e6e823d43b329",+ "92d6be29f889ee5fb4f9fbc8895388ec49975b3b19c86d2b1740e2ee8778dabc",+ "98c3a38cf6180d1e925b16f4fb5160f27d2a7b399d928d7fa834555e658c843f",+ "98e840268063fcc8f285364dc8b0098e416621ea99e9a92ab986661200f122e9",+ "9b4da1d640c6c7882cc583f5fcb04a7a3c478a3b167ceefe9a1fdc8613e7a547",+ "9ddb7e697174484b2411c6b7239e73374200512597bd5de9f9654ff796e3a39a",+ "a3b0de3f98f20af674ba28457062092e2efa64744ff56d3b82947ec2148e629b",+ "a61adc1611286d1336bdd4ed8da55258bc1467cfc824161a30bb992ac69607c6",+ "a7915e920ff78b5e3ea4e70e44c69353b0af6d549c0fa5fe4cae919f5bad25ec",+ "a90de9de8b3eee047b4bc975f5a2a63470baefd516276482601474c18b28cdca",+ "ac698a81097d343c597c821a045605aaa9d96f20dc26bb49581553d3c440b398",+ "b91a2a6f9f9b431a1c646a1798bb79b2d9374c0b1148047482a472b02f971a68",+ "b9507ede5b95551c3036430f06cd4f571c836fc01776c98c8d58b90b05aec8c1",+ "bb367376891f75673a4fc0c73fc2033c76f94c8b2b0984c577d2a66435f72c12",+ "bc2f52bcd3bbbf29c2abc04941cde4b621e111549bb3294d88c3fd890a51b310",+ "be2fdcf316d1c3f369efba7b70ad11898c1185ed7272cfa917c9484b8072b823",+ "c1c6d62cec339ea9ff24d92319fbadad062ec3b737f08ab327e31dfe32343740",+ "c877e1eb3a9a3ddfd3219e6aaa898dd591762b9f58f5db3847c839928ac1d378",+ "c913b93cb0115918750d80e1436fc0fcaaca0f30cda490596446de2ecdf4fe10",+ "c9523547ceb490f1020b3201b0fed9e73c55f7c80b7f0905c7e19cbec8e52dc9",+ "ca5f7c5e012a098428883e6286285011158cd3c6133f45dd4bb50d9b7db78245",+ "d3a01fb8fe168f8690ea3beba3c24320ad66d47a7d6986a1a80d68b0c31aa969",+ "d6a68661ec5f33dbbd38f11218e9df7a63186cb49a1fe90652e12918de09f7d2",+ "daaf60c750e57fcac9a5048e3c9d95dc96300f9dc16e729ff4ff528efeeb35f7",+ "dba04bd033c9db80c81aebe62473395306060e31806f21e069dd721471e63c30",+ "dec97741c7d53dd2ea7eb8ea6696a69bf29f4999b8c6d87b726f9eba701a365f",+ "dee3fc395dfbf9b8591e8a3d150c0ec0a03d4b76f1a7cd4a4314bf4c412c29f1",+ "df0b2e80a980a7edb63ebee1ff6ac456c77b66bb1a29afd6b99072da6962a299",+ "e3545b531e901922dd52915cb02e02d91dd78f419de1b41438d28f8530e0126b",+ "e38726fc3b4e576d508a802de8d1895847dcaee19a96c2e4e69ec69f8767f137",+ "e627bc200a090fe621c5bf4a37a08232a51d92f1469a13ec56ca767bfbe32533",+ "e63134f1ade042a11b5bfaa59875ffe0a4901ba906a3df7f2cc5dbca3db5421e",+ "ebc9f56fa49a171f9371df6846b3cdb66352854732203b299da73d0d687b0107",+ "f022666ee8ed968329315c408ac3700e5f4f7e3a79eebfd7ce5fa951af3251f9",+ "f175f1c9e5baab1acbdafccc34c87b0643b701fe256b7ccc58f5b9c88c3c84f2",+ "f3bca683c2978edce9a6545be5694bc6fa522432ba8c4a1e7d4c3b8cdf7563d9",+ "f56b10bf965a1f37c70dc49c6689b607c48b789badcc1d66a56709b4f2211f6f"+ ],+ "Caddyfile": [+ "14d8d6482859d8a03883cb4c9b38abfbbcf258328ea9089255ab5df2538efa40",+ "1b76e5d72717bdd83a253cd0f4b9a1da432e4fd29ad7ccebbfa93234d2101d2f",+ "2895dd04b7e2aa729d1403a98ac9c37f1a2eb873ab323bc9e50e4b42d11ec56b",+ "2d235094ef1165f43b1c967f666e32f10672ca808bd1bd1044b44776bda9e53d",+ "334c5a8a4e607261c3f75d286e6a4dd207dbeda456486134e035776c53467817",+ "54bf681fc011dc8e4b92125f8745c18d71ddc7a1669e2650f40af3bce246956f",+ "60a7a06a5eeb83a7a236aff2412692a5841da1f5a80d8afb4d4ff3e70e32ef71",+ "6f88e16d9fa2d2c57431304bcdb1384236ad0f82f3e205692e10050c57381352",+ "734b9210e29c837d2312a7a03b19dc5aa7233848399debab9a5e474fa7fe1570",+ "7fd66a72a740258ed71fcaebce927bdc9b2528177cfeb5ca9e0c0ee778dd8769",+ "cb68f62d48bc54bc908840c6dce85843ac5580e6196e5a9b978dd14ffb3d5280",+ "e9ab1a7ad99211172f68cfa2728beeb86dd4ed220635cab5f8461bb2b49cb023",+ "f02d23b1c650c157ab53ee7cc2057c0d6dec7b93f5dbd99982c594cdd6c766d1"+ ],+ "docker-compose.proxy.yml": [+ "3974063c062136a334ddbb9b304837c0023817fc54fe579c0d3088bc12066619",+ "4529858cf04f17b6c50504d6107b284d53f70196657f83a850bab1a6703e6264",+ "a762bef88602e49e8cbf03bdbc14b38bdb6afe6c7729277266056699876c7613",+ "c60a0e1dda5348ac3efe72edcf288e13f81dd826d69fadb53fad35fba94dcf6e"+ ],+ "docker-compose.yml": [+ "04d81e0d92905b34e09cd99b22bf92f6b9b311c7405c7a71b8991049496159f8","0efe4372775d4f4ec72d1ef6544cbd3e0e562f9e71416c7066f9a1ef86d5b2f3","0f21293efe5232437bbe5f1789b20aafc22b4ec2542640eba12077a0520ab04e",+ "109e9a8122fe26fd0c0634c7c510f918044a741fb9ff0e6c13a452467f0c66dc","157789f7afd0cef66789ab00619f1bbef23f3a20bc3ed13d2e560eb194329938",+ "15e399ded5f58e727bf0668e0f7a501f1ea5c8441b125e916b142c1d333df0db","162b1116d60f2405b4b8d4143ddf0d04218a723913eae155a0aee89db422ef53","18f553988c45ad8a046513c1de975d1916439073e0b9133f61169268d7a3d35a","19e6b92541f1ecc8ed10054c3863baf7bfd83b618771ca4176228662db557030",+ "1a4d05790bc861ce11d93c05f0ea3c8479c2b396fd15f6559c7f04d3d41c981f","1cb102f9799ba8858a1fee71abdd4111085c997bdeddd5d878c0d8f28c85fe50",+ "1cfa92aead5e23b155290808c76455746c9538b2291dc9751e10a7b6e0cfcc3a",+ "1f1227c600830759ac92ce5461e0bc2e44eccab645924eafeb3abefd107c7771","220e00bf57c7f3dcb91ecab5a4c2b9d01ff3ca45654f6fcb4c3a65ca7fd9b651",+ "235f65991c56f26a497fd58e0114701560196b5ae9d6618c23caffc5e9c794cc",+ "24c91247aeee4d8be190ae2b3c07627b53c121874ddc76cc8f1c98df162e5022",+ "263045ea3ebeeb45ae46f65bbe8921c3dfd64c6378747560800085e2462f288a","2686e66bbe88d92303572996c8bd2b1b5af670cd3fea93ee366c996c14ba3717","28b7ee919831b85313d5dea3f80ef6faa61d79ad64f86c7f1405eb988fd48543","2bfd3cf8a9b5b93bbc39ecc2fd4dd092717a1e117b69079c991879ceb0350c85",@@ -27,10 +138,14 @@ var shippedHashes = map[string][]string{"41d78075028923bc0e107ca08cfe06ef1f07e702cc9a230a4b01a68d582ebac2","41e4455e04f992b5da210aa66fab0d4a851a2c3bdd715f80a70aef5fe0fdb51d","4204a44525f9b8f74af0b3c27cdbb12b53ccdfe8cadeb48cc4a847cac50f0af2",+ "4260bd5f1ef2a621a58e862fbc23a4a3bc8aba30c198e4ef3ca84f26c10240a4","42a9b3bc48664721e538148d0287e4800406e19dffaeda4042c630b541684fba",+ "44023f62777e59493786c7f5b36b5c984f9ed354693679a751fe647860b659a0",+ "445fbb2e3b57a186059a8e846d80fa1c41b8372428ca2c4ca6fa89f3fdc5b462","44f53fd8e1d613ef2c3b0a415a66b09dc90fee92d81ad802bdd8c828f2c19aed","4844155b23c071dc9c4fc33a0fbc1ae32ebfe5361e5126e22f4d63518cacdf98","4920d9fd9af56c427cd1523ed29e66383dad7870ed9790a78818749f71c70397",+ "498d3c487cf0adc20468bf318d7ef97eb1fdac9d27b2e6a1ebb2cbc5b5cb384a","4c060846e5211265979537e4ff9058d52f7e6e5cbfa262c4533dd754e0d88cf6","4f39101a2c6a2d7bc84a5306568bc969b173b5efd87e18c89a63d62e826b2056","52b2532c0bd9f83292fbedd72aeef152fa1ae9a956b7822df3f5b7d271db2452",@@ -38,25 +153,31 @@ var shippedHashes = map[string][]string{"5326ddf97e15832ede8b81f35806771a8d6266694090c30d5f6785ad41bb3ea9","58e05e558ea35917e9ab31d4ae82303a4fa4b341eb52b086c7cad472552226c3","5b1c76e4c30929a73290be33f06e696fa07428ea6777f0732de0ed51c9da0daf",+ "5caa1d92731a1a5ebbe7b15848a2dc222091c5c960b2f98fd88b6b8e6f335c37","5d19dfd09f0abd5ad71a1aa932a4ea5dc36b54f8ef6f93ef94b1f447dc10dcdb","5de0ed9771bcc01f55fb94d5e2531c23b29575be0e2474270aa56153d1331c12","5e1ca966bc04335d796d5cbba0c78620cc59759dc5e35b69bffa3e1fcf717b6e","5f31e9420f404691359f03150cd0e41e5c1d874ef561755aaff73d558c9438e1","5f4ac8120c26fde652d466e90d93969a4834e0700ab15c895c0a58a47c0d143f",+ "60c8ec0d091036f8f149b534d8b6872780025e93ef580912cb5b7107c7d5957b","673abaeb5056d9f1818619e60da5279790eeedb3a911bb4f02a82f30c10918b6","6d2587b99850f3346a15b34d09a7d5cb1ebf2066176e95990502f4e60539437b","6fbf816153040d0ec08b6174affff6d2b7d190729104507b17e94df651d75dc0","71d4eba137f1b895f4210fda997d7f14aeb19aa35490d34b8dfd8fe122634a36",+ "731c6f9bf69024a781e17316dbf00464685036ebbd2b55d42221d3d1ae36ada7","74eeabaed9809af982878f2891637b4e146b5da78e31dfaae87aa0ae66d530a4","75f33db78a433707af6b20749933215e38aa2506c2d7ee51d367051d7b855220",+ "794babaca92fff4fc70620fd056e39e6c266d77ae8960d71a46bc9a69b54949b","7a37892360b92bd824767020df68c6e12a50488daed5c1079682cfd949eca94f","7ac84290b16576a44d8adbe0ae1bd8fd70e224087774d9e5a7ffceec929458fc","7cf2553a07462c9a433b4030e0994698589c7dfede40e0d0d38cc180912b8e0c","8268c6868d00231270b98a54ccfb93257b1a24988612fbddaffa048b918fddd3",+ "8458bf2b0af0b59c96cf78c2251f6aa99eb340a4fcd29b2bb77592571081a1b7","84a4e8815a9a9266795ac5695f6192d49b98e764683d0e05f9346a94cb3aa307","850ca1f44f0d2bca8bc4b814b2e37f03aa9406aa12cc993e4b9f367619cf9867","866f31db55570984782ad97d872d72bb7b1415f02575e52aecb1115abb18d504","87a7ba294d499944c7e976c415019ee9f6ae4d29a627324a5b625ac3c51e116f",+ "888cf82dcaec5041633836caa30d2d4fc06659731093865037496c0907018355","893b3367ed49800478b7152c8f46190be2ad9196a04bab99cb53a964242daed4","8b89586104a5a1f3dd6d997ce43ff935d08298983660b6fec9f8b21739dada1a","8f0ae94476bbf3aabae086154b1ffa23ce77427ee445f48043e11cc96860faef",@@ -75,22 +196,30 @@ var shippedHashes = map[string][]string{"aacc4a2fbb9d45b420fa5563a1610b7e83b4403c72308ffb61787c8d677ff896","ada9e01947d1b70a54337a78d8a0f1838f4432cc49ebe43687df454e9d9e8788","ae06d07690575bf4e6050e96536d59b3f107f3b08d9631c78c641e08f790167a",+ "aed9fc69aba980e91ee8c568f4b85b638f485e9b2c2c4a04d101d89224e04d68","af22494276b2123b044ef4106c89352e4b6272cec5901bc35991d430d7241856","b28377933c7a463262c90953f7aaf43a9f870ea91e4c187a53157c9c17c3c802",+ "b524f7ecffb515f12a8e9f8e3d1f5d6901c475ea6820aa47de93eec7e02c94cf",+ "b99d517d75ff7b8f3b72ad3a1d6b830f030afb6c0f6de04f9451981ca2195e26","babe3b5fc5cc11523674b1ae8854e968ef764b84f3f43c7981e0d153f3ba1e8a",+ "bb7d63f91c5df4980ad30b1abe73c4e96177de7e2c4fbbc4cc8fc3bfd79d1855","bd704e08131cd732aa1c752f8994a28cbdc7dbe9397dec9006d567259380627e","bd7ecee148c238ac0ffa19f2dd8e2fef1fa681695eb99ae396098199a1a74a9a","bfc19bc0e3349dd34b6fc9a2fd7fbb91cdd2a5ee8ad1d9c8c657357e210a0565","c3a465d03d5b5586e034e0cf4233f44af04a2d1c23d914746d8b1ccdfabf6755","c56fb86903863572911f77bb8fd5b50a7ca349b609e885a998f8ff73b0013f75",+ "ca06da11049cb7bfe07606ab5544dd0eb9f03c688859bdc716ea17a1f5c1f537","ca4d5b546e7f382e4da53856409ede3a4ce5e1e04f911f404ebad079fc986a93","cb4e7e88c507e8fc897dcd9c433accfcf44e3ad30c0bcfa6301e935d023ac8c1","d45c2926928c5aa7034b1b7297d36f1400d507850ae2a8321ff244db4c783dfc","d4a2b857bf738e725efbf55de83f53d6094e559ee05c88d72b8475f0809c54e6","d4d6f422225332a8bf22ef4ea59f8937a3084c6aca662a30e6e7bce22e9d6199","d58705c9a3f5c26d5d8b9f031d344b36cb1c0cbba81909e09905050188920993",+ "d5f11de380cfb6fac70bcd2c068f832f34eae28cba6367790eff7b0bd65a27c5","db1a32c92781d9b4f2c0202ff09ff33db30681b2058004538bc920e399f98552","e0bf1da84404b33a0bf9d2670dba52a66d67450e822be1e7e1616d014d8f5026",+ "e2324b69af6bc899857c2a03c260e8fee36bc0a81de4a815a727c9ffb3b27eee",+ "e2a1bbfa571993288e405f63e87197c7c16ddc9eb83c0d13eb36163e79529339","e74c08ea2d9be3e033df747a00f3958b9ed7b8dc70b2fa7884ccc336e3e4653b","e9eae1a349684227973195851b923dcfeda4ace79e20f67117dafd6b6a93b76a","ecb74dd1f3887be0146e5b31931016f3f31f4a7f2a55b14167a5e53c95d9b01c",@@ -103,119 +232,16 @@ var shippedHashes = map[string][]string{"fa4fb2ea2d033ee34fd5203f7acda3bb13f3b65c0f6f8e2003ccdd16e4eed14e","fb336f82038c6054faf90915cf09a7622e67e34be48365f9676b372536e2996f","fcf293ff891bdb0c8dac232bdf2287e66554d691de4db614a1b3d50c13ce641e",- "fda863ed6260000ebf53aa4e6fe28348a092155fe8d598d7ead1eb2e36c33c03",- },- "docker-compose.proxy.yml": {- "4529858cf04f17b6c50504d6107b284d53f70196657f83a850bab1a6703e6264",- "c60a0e1dda5348ac3efe72edcf288e13f81dd826d69fadb53fad35fba94dcf6e",- },- "tunnel.compose.yml": {+ "fda863ed6260000ebf53aa4e6fe28348a092155fe8d598d7ead1eb2e36c33c03"+ ],+ "external-object-store.compose.yml": ["f8fb8bbca04500af5c266d8931dc7419f4899590eb92ed54e515f16f172fb8d8"],+ "ipv6.compose.yml": ["ee4bcdfd2a907372b5a0f3ab878ace957b72359c929456524cd095599fa0472f"],+ "tunnel.compose.yml": [+ "1c4225bf4663a705505b8db18aad4835614ee1e05bfda694026f0f0c30d361a4","1cb60de41596417a1e59bc4d4ef123a1dae1e5cdf4c3cf3d48674ed00641631e","244abe1c53b368b02136c1842455e2e7b76f185ee3e76f4770782bde6f2bab5f",+ "60cf22578e6060036544a52ced0b45e2123a93a197827bd00094a93b17d61cec","7eed21df29b958db5af366aba9ea60bf9d234c73a50f319f373dd53f09b8d78f",- "d36c5a277a6c57c50e3a659e2ff60306862a11b3d3e44c54567b49d2d64779c0",- },- "external-object-store.compose.yml": {- "f8fb8bbca04500af5c266d8931dc7419f4899590eb92ed54e515f16f172fb8d8",- },- "ipv6.compose.yml": {- "ee4bcdfd2a907372b5a0f3ab878ace957b72359c929456524cd095599fa0472f",- },- "Caddyfile": {- "14d8d6482859d8a03883cb4c9b38abfbbcf258328ea9089255ab5df2538efa40",- "1b76e5d72717bdd83a253cd0f4b9a1da432e4fd29ad7ccebbfa93234d2101d2f",- "334c5a8a4e607261c3f75d286e6a4dd207dbeda456486134e035776c53467817",- "54bf681fc011dc8e4b92125f8745c18d71ddc7a1669e2650f40af3bce246956f",- "60a7a06a5eeb83a7a236aff2412692a5841da1f5a80d8afb4d4ff3e70e32ef71",- "734b9210e29c837d2312a7a03b19dc5aa7233848399debab9a5e474fa7fe1570",- "7fd66a72a740258ed71fcaebce927bdc9b2528177cfeb5ca9e0c0ee778dd8769",- "cb68f62d48bc54bc908840c6dce85843ac5580e6196e5a9b978dd14ffb3d5280",- "e9ab1a7ad99211172f68cfa2728beeb86dd4ed220635cab5f8461bb2b49cb023",- "6f88e16d9fa2d2c57431304bcdb1384236ad0f82f3e205692e10050c57381352",- "f02d23b1c650c157ab53ee7cc2057c0d6dec7b93f5dbd99982c594cdd6c766d1",- },- ".env.example": {- "013e26017b51e7310d7e044090b50d0b4ae33cd1d91f0ac380a0a6783d9edab1",- "0b718956b039a8d8402bd9c6102322fb273159f2834509fdf23a95459c7537b9",- "0e54ce3bfec7340d76214240c4bb9dc8dd9a33dc9ce57eff70d8d15f909cf7ab",- "1263f66b22074f380e55198a32d759ae5196bb9b44d8a62473c6f41dfb770905",- "1335c63f715dab6fa0b77d012aead1343ea027e8e047357e2c1df0b653eac7e8",- "148f6a5506fb6a147668c4190690e141cb931b1f93d0a0d5cd459aaf2d3d6dfe",- "1599f1c87d97dbca696a72fd7b7929d467a070bbe037ccc3944abf3ff725f7fd",- "1c2224572db81239f4500d051dea92aa195338d90085423c0be53f8ac70d8162",- "1f1f7d647217b224ab8ca7e28ab656eeaf18a3fa2dc125ab6e5a6c9f8242fa5b",- "29f53f3e7053c764e3611885708fcff47ae1a8940f47d950924f989b6724591a",- "2b23ac88751a5e043aa48b14d1bc54336c0fca352f98825079eedb270a388b31",- "2bea98e5ef69a0689e0a30146b2ce3666bd9f79f3141a67b564365e2d61af2a9",- "323db63ebf2cb5da13e28eb04ecc9ccb01c9ce7617e268d3cb190099a3928c23",- "342d21846f0e0c3a97097910aa19b77d8169263c679f9d66619744bf6bf9b2c7",- "385846c96b53d4087921ec009ed015228d705cb84375b5b194e8255414b264a7",- "38eac49e5649a4520d03973c8bc2b1517a8a54a609305588d273124fb87ff943",- "39d9609d5fcb2c4df68267ea879600367c0a4dc261b056e005b1504b30f207d7",- "3c7c86d97879b3783cd02dc54bba1457506f3d13317f02d0f24dc520ea30b51e",- "455e8fa8321e7feeb2eecec376c58e6d9b55fec7b411d575fd47e72e3a6591b7",- "48387bf3cad43d59021a54e194a57536ab29b902a1391ad960c5155003023cdd",- "4c2e09384626a1cd1db2bedfb8407a511dd791209b2d3126f9c9eb74e2712c4f",- "4d728275b94de079eedc55f908959802d481d760105d091ce3e11e86fd710298",- "4d9e1f3f1a8edca1792943e15ebac5ae4f811536e86c0ff2e496bd1c4a1a1ea8",- "4e21e02f2387bad78036fae1584b4e2df50026a7dcb9930a8649c4315e867997",- "4e8ffd24b228fba269cff75b2cc8968e9a461723522117065e5edf83b3c5029c",- "553a22ead3ee4364f995f9d9e3bb548ceee12f74657b6122cb0a199409ae02ed",- "571f2af0a08de9a0d674e12e2afb77e572c2f0d7ec5fec8b7a69e7425a45a430",- "5893d91877c7d96188c071dfd6e76976c10a2ed759c16520c5685068b9edf5d2",- "58b4077b8d302e31f65e46e0e811a551634afded9d4642166b722a1289c22168",- "5beb16eced4c5420c08c2972f13d80b6976e6d3aa5301f11d4cdf3b6fc74e078",- "6188588df12b426670119483c24d0b2a3182e28c7c1d6bed241d50323dcd9439",- "657789086500da432901c143ec001dc46fa125aa5b77d01548ff82065d8fe457",- "6a946f39a24f77084ea805342984d635f3082ce8e1c23ab4fc17ba8de38886b5",- "6b19e20d94980710724bd400104498c87def9bad5f3032a56c7f09fcf9e1b9b3",- "6fae7995d47c43a00bd0107ff7b60e0d1e000768dc4b38c34d3e3a0d2a6f8bb3",- "727d5063ed2c959932d7721d8a806f77852cfb017b2fd3f981e01f31c136c057",- "73faca6872d91a8f24a71efde33307aef8a3559241851bdc703ce0c4b3ce80ab",- "75eaee5650ddd1c9af5d414440be8f7736df86ee4556827620a681627a9d1fc8",- "762fdb27709acc69b7f9f6032476818641a5aeda6516481e5c93080cff3419cb",- "78740c67acc541e8ae2432defbf3df21c548a895e2aee070052541d0fdbe533a",- "78c81c9bc7b1715189783331824a60fcda365a26a52f3aaeb7209913735a9261",- "7a020c862ad7a0d49664afc66c90b8f77e33fa4fd0282704fc8805b955e45b65",- "7ab3cc0b7b2018ba02080d5ebea62ac60c88744b5154c1d6460a837bd708f222",- "7d5820c1f0511ce9f9fa1c556c5c91403b709432167d23f2745989ecbc5f2824",- "8017d631d7d6cca17defbece31a06283461965852f00afd8ad1dc7da88eccf45",- "8ef9eb799431fb64b29f0eb8f62516ad33577ef0cf31e7d0d1f2285ab30f3712",- "92bbf72022a7e25f72f93bc95e25ce7056249a9fc4cb4838c34e6e823d43b329",- "92d6be29f889ee5fb4f9fbc8895388ec49975b3b19c86d2b1740e2ee8778dabc",- "98c3a38cf6180d1e925b16f4fb5160f27d2a7b399d928d7fa834555e658c843f",- "98e840268063fcc8f285364dc8b0098e416621ea99e9a92ab986661200f122e9",- "9b4da1d640c6c7882cc583f5fcb04a7a3c478a3b167ceefe9a1fdc8613e7a547",- "9ddb7e697174484b2411c6b7239e73374200512597bd5de9f9654ff796e3a39a",- "a3b0de3f98f20af674ba28457062092e2efa64744ff56d3b82947ec2148e629b",- "a61adc1611286d1336bdd4ed8da55258bc1467cfc824161a30bb992ac69607c6",- "a7915e920ff78b5e3ea4e70e44c69353b0af6d549c0fa5fe4cae919f5bad25ec",- "a90de9de8b3eee047b4bc975f5a2a63470baefd516276482601474c18b28cdca",- "ac698a81097d343c597c821a045605aaa9d96f20dc26bb49581553d3c440b398",- "b91a2a6f9f9b431a1c646a1798bb79b2d9374c0b1148047482a472b02f971a68",- "b9507ede5b95551c3036430f06cd4f571c836fc01776c98c8d58b90b05aec8c1",- "bb367376891f75673a4fc0c73fc2033c76f94c8b2b0984c577d2a66435f72c12",- "bc2f52bcd3bbbf29c2abc04941cde4b621e111549bb3294d88c3fd890a51b310",- "be2fdcf316d1c3f369efba7b70ad11898c1185ed7272cfa917c9484b8072b823",- "c1c6d62cec339ea9ff24d92319fbadad062ec3b737f08ab327e31dfe32343740",- "c877e1eb3a9a3ddfd3219e6aaa898dd591762b9f58f5db3847c839928ac1d378",- "c913b93cb0115918750d80e1436fc0fcaaca0f30cda490596446de2ecdf4fe10",- "c9523547ceb490f1020b3201b0fed9e73c55f7c80b7f0905c7e19cbec8e52dc9",- "ca5f7c5e012a098428883e6286285011158cd3c6133f45dd4bb50d9b7db78245",- "d3a01fb8fe168f8690ea3beba3c24320ad66d47a7d6986a1a80d68b0c31aa969",- "d6a68661ec5f33dbbd38f11218e9df7a63186cb49a1fe90652e12918de09f7d2",- "daaf60c750e57fcac9a5048e3c9d95dc96300f9dc16e729ff4ff528efeeb35f7",- "dba04bd033c9db80c81aebe62473395306060e31806f21e069dd721471e63c30",- "dec97741c7d53dd2ea7eb8ea6696a69bf29f4999b8c6d87b726f9eba701a365f",- "dee3fc395dfbf9b8591e8a3d150c0ec0a03d4b76f1a7cd4a4314bf4c412c29f1",- "df0b2e80a980a7edb63ebee1ff6ac456c77b66bb1a29afd6b99072da6962a299",- "e3545b531e901922dd52915cb02e02d91dd78f419de1b41438d28f8530e0126b",- "e38726fc3b4e576d508a802de8d1895847dcaee19a96c2e4e69ec69f8767f137",- "e627bc200a090fe621c5bf4a37a08232a51d92f1469a13ec56ca767bfbe32533",- "e63134f1ade042a11b5bfaa59875ffe0a4901ba906a3df7f2cc5dbca3db5421e",- "ebc9f56fa49a171f9371df6846b3cdb66352854732203b299da73d0d687b0107",- "f175f1c9e5baab1acbdafccc34c87b0643b701fe256b7ccc58f5b9c88c3c84f2",- "f3bca683c2978edce9a6545be5694bc6fa522432ba8c4a1e7d4c3b8cdf7563d9",- "f56b10bf965a1f37c70dc49c6689b607c48b789badcc1d66a56709b4f2211f6f",- },+ "d36c5a277a6c57c50e3a659e2ff60306862a11b3d3e44c54567b49d2d64779c0"+ ]}diff --git a/fluxer_rexctl/internal/instance/shipped/main.go b/fluxer_rexctl/internal/instance/shipped/main.gonew file mode 100644index 000000000..939d4b98f--- /dev/null+++ b/fluxer_rexctl/internal/instance/shipped/main.go@@ -0,0 +1,81 @@+// SPDX-License-Identifier: AGPL-3.0-or-later++package main++import (+ "encoding/json"+ "fmt"+ "maps"+ "os"+ "slices"+ "strconv"+ "strings"++ "github.com/fluxerapp/fluxer/fluxer_rexctl/internal/instance"+ "github.com/fluxerapp/fluxer/fluxer_rexctl/internal/stack"+)++const path = "internal/instance/shipped.json"++func main() {+ if err := run(); err != nil {+ fmt.Fprintln(os.Stderr, err)+ os.Exit(1)+ }+}++func run() error {+ data, err := os.ReadFile(path)+ if err != nil {+ return err+ }+ var known map[string][]string+ if err := json.Unmarshal(data, &known); err != nil {+ return err+ }+ add := func(name string, data []byte) {+ h := instance.ShippedHash(data)+ if !slices.Contains(known[name], h) {+ known[name] = append(known[name], h)+ slices.Sort(known[name])+ }+ }+ set := stack.Embedded()+ names := []string{stack.ComposeFile, stack.Caddyfile}+ for _, name := range stack.OverlayFiles {+ names = append(names, name)+ }+ for _, name := range names {+ data, err := stack.ReadFile(set, name)+ if err != nil {+ return err+ }+ add(name, data)+ }+ add(".env.example", []byte(instance.BundleEnv()))+ return os.WriteFile(path, format(known), 0o644)+}++func format(known map[string][]string) []byte {+ var b strings.Builder+ b.WriteString("{\n")+ names := slices.Sorted(maps.Keys(known))+ for i, name := range names {+ quoted := make([]string, len(known[name]))+ for j, h := range known[name] {+ quoted[j] = strconv.Quote(h)+ }+ end := ",\n"+ if i == len(names)-1 {+ end = "\n"+ }+ line := fmt.Sprintf("%s: [%s]", strconv.Quote(name), strings.Join(quoted, ", "))+ if 2+len(line)+len(end)-1 <= 120 {+ b.WriteString("\t" + line + end)+ continue+ }+ fmt.Fprintf(&b, "\t%s: [\n\t\t%s\n\t]%s", strconv.Quote(name), strings.Join(quoted, ",\n\t\t"), end)+ }+ b.WriteString("}\n")+ return []byte(b.String())+}diff --git a/fluxer_rexctl/internal/stack/images.go b/fluxer_rexctl/internal/stack/images.goindex c09227a9c..a25603806 100644--- a/fluxer_rexctl/internal/stack/images.go+++ b/fluxer_rexctl/internal/stack/images.go@@ -136,26 +136,26 @@ func UnpinImages(compose []byte) []byte {if err != nil {return compose}- found, err := imageLines(compose)- if err != nil {- return compose- }- byService := make(map[string]string, len(templates))+ var prefix, suffix stringfor _, t := range templates {- if strings.HasPrefix(t.value, "${FLUXER_REGISTRY") {- byService[t.service] = t.value+ head, tag, ok := strings.Cut(t.value, ":${")+ if slash := strings.LastIndex(head, "/"); ok && slash >= 0 && strings.HasPrefix(t.value, "${FLUXER_REGISTRY") {+ prefix, suffix = head[:slash+1], ":${"+tag+ break}}+ found, err := imageLines(compose)+ if err != nil || prefix == "" {+ return compose+ }lines := strings.Split(string(compose), "\n")for _, img := range found {- template, ok := byService[img.service]repo, digest, pinned := strings.Cut(img.value, "@sha256:")- component, _, _ := strings.Cut(template, ":${")i := img.line - 1- if !ok || !pinned || len(digest) != 64 || path.Base(repo) != path.Base(component) || i < 0 || i >= len(lines) || img.column-1 > len(lines[i]) {+ if !pinned || len(digest) != 64 || i < 0 || i >= len(lines) || img.column-1 > len(lines[i]) {continue}- lines[i] = lines[i][:img.column-1] + template+ lines[i] = lines[i][:img.column-1] + prefix + path.Base(repo) + suffix}return []byte(strings.Join(lines, "\n"))}