Skip to content

Update rabbitmq Docker tag to v4 #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renovate wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Update rabbitmq Docker tag to v4 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
32296f6
Add telepresence
Brutus5000 Nov 9, 2024
d0ea057
Update telepresence-oss Docker tag to v2.25.1
renovate[bot] Nov 26, 2025
b9d7610
Add replays old to content (#204)
Sheikah45 Mar 23, 2025
57e913f
not read only attempy
Sheikah45 Mar 23, 2025
84c8800
remove replays-old mount to nginx
Sheikah45 Mar 23, 2025
fd4c337
Change delay to 30 seconds
Sheikah45 May 3, 2025
76e87c7
Allow top players to match with anyone in the 1v1 queue (#211)
BlackYps May 8, 2025
5388881
Enable force relay
Brutus5000 Sep 5, 2025
321fddf
ice-breaker set to trace (attempt 1)
Ivan-Shaml Sep 7, 2025
516f276
Drop promtail
p4block Sep 21, 2025
656ab33
Add a values for alloy prod
p4block Sep 21, 2025
c5d70ad
Fix duped yaml key
p4block Sep 21, 2025
c02130d
No affinity for loki gw
p4block Sep 21, 2025
3bf4cee
No affinity for loki
p4block Sep 21, 2025
0d11066
Fix yaml
p4block Sep 21, 2025
c964433
Python server log level DEBUG
Brutus5000 Oct 21, 2025
d31f100
Drop promtail
p4block Sep 21, 2025
3a83247
Update faf-icebreaker to 1.2.0-RC2
Brutus5000 Dec 20, 2025
eb1f588
Enable Cloudflare
Brutus5000 Nov 23, 2025
242ff2a
Update icebreaker to RC4
Sheikah45 Dec 27, 2025
c23ed16
Fix deploy coop maps
Brutus5000 Dec 27, 2025
38cf697
Update rabbitmq Docker tag to v4
renovate[bot] Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/faf-icebreaker/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ data:
RABBITMQ_HOST: "rabbitmq"
RABBITMQ_USER: "faf-icebreaker"
RABBITMQ_PORT: "5672"
CLOUDFLARE_ENABLED: "false"
CLOUDFLARE_ENABLED: "true"
XIRSYS_ENABLED: "true"
XIRSYS_TURN_ENABLED: "true"
GEOIPUPDATE_EDITION_IDS: "GeoLite2-City"
LOKI_BASE_URL: "http://monitoring-loki-gateway.faf-ops.svc"
FORCE_RELAY: "false"
QUARKUS_LOG_CATEGORY__COM_FAFOREVER__LEVEL: "DEBUG"
FORCE_RELAY: "true"
REAL_IP_HEADER: "Cf-Connecting-Ip"
QUARKUS_LOG_CATEGORY__COM_FAFOREVER__LEVEL: "TRACE"
2 changes: 1 addition & 1 deletion apps/faf-icebreaker/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- name: geolite-db
mountPath: /usr/share/GeoIP
containers:
- image: faforever/faf-icebreaker:1.1.9
- image: faforever/faf-icebreaker:1.2.0-RC4
imagePullPolicy: Always
name: faf-icebreaker
envFrom:
Expand Down
1 change: 1 addition & 0 deletions apps/faf-icebreaker/templates/local-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ stringData:
RABBITMQ_PASSWORD: "banana"
XIRSYS_IDENT: "banana"
XIRSYS_SECRET: "banana"
HETZNER_API_KEY: "banana"
JWT_PRIVATE_KEY_PATH: |-
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDXsCsl9W0vnW2k
Expand Down
188 changes: 74 additions & 114 deletions apps/faf-legacy-deployment/scripts/CoopDeployer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import org.apache.commons.compress.archivers.zip.Zip64Mode
@file:Suppress("PackageDirectoryMismatch")

package com.faforever.coopdeployer

import com.faforever.CHECKSUMS_FILENAME
import com.faforever.FafDatabase
import com.faforever.GitRepo
import com.faforever.Log
import com.faforever.extractChecksumsFromZip
import com.faforever.generateChecksums
import com.faforever.md5
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
import org.eclipse.jgit.api.Git
import org.slf4j.LoggerFactory
import java.io.IOException
import java.net.URI
Expand All @@ -12,16 +21,8 @@ import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import java.nio.file.StandardCopyOption
import java.nio.file.attribute.FileTime
import java.nio.file.attribute.PosixFilePermission
import java.security.MessageDigest
import java.sql.Connection
import java.sql.DriverManager
import java.time.Duration
import java.util.zip.CRC32
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import kotlin.io.path.inputStream

private val log = LoggerFactory.getLogger("CoopDeployer")

Expand All @@ -34,33 +35,6 @@ fun Path.setPerm664() {
Files.setPosixFilePermissions(this, perms)
}

data class FeatureModGitRepo(
val workDir: Path,
val repoUrl: String,
val gitRef: String,
) {
fun checkout(): Path {
if (Files.exists(workDir.resolve(".git"))) {
log.info("Repo exists — fetching and checking out $gitRef...")
Git.open(workDir.toFile()).use { git ->
git.fetch().call()
git.checkout().setName(gitRef).call()
}
} else {
log.info("Cloning repository $repoUrl")
Git.cloneRepository()
.setURI(repoUrl)
.setDirectory(workDir.toFile())
.call()
log.info("Checking out $gitRef")
Git.open(workDir.toFile()).use { git ->
git.checkout().setName(gitRef).call()
}
}

return workDir
}
}

data class GithubReleaseAssetDownloader(
val repoOwner: String = "FAForever",
Expand Down Expand Up @@ -160,25 +134,14 @@ data class GithubReleaseAssetDownloader(

}

data class FafDatabase(
val host: String,
val database: String,
val username: String,
val password: String,
data class CoopDatabase(
val dryRun: Boolean
) : AutoCloseable {
) : FafDatabase() {
/**
* Definition of an existing file in the database
*/
data class PatchFile(val mod: String, val fileId: Int, val name: String, val md5: String, val version: Int)

private val connection: Connection =
DriverManager.getConnection(
"jdbc:mariadb://$host/$database?useSSL=false&serverTimezone=UTC",
username,
password
)

fun getCurrentPatchFile(mod: String, fileId: Int): PatchFile? {
val sql = """
SELECT uf.fileId, uf.name, uf.md5, t.v
Expand All @@ -191,7 +154,7 @@ data class FafDatabase(
WHERE uf.fileId = ?
""".trimIndent()

connection.prepareStatement(sql).use { stmt ->
prepareStatement(sql).use { stmt ->
stmt.setInt(1, fileId)
val rs = stmt.executeQuery()
while (rs.next()) {
Expand All @@ -213,32 +176,25 @@ data class FafDatabase(
}
val del = "DELETE FROM updates_${mod}_files WHERE fileId=? AND version=?"
val ins = "INSERT INTO updates_${mod}_files (fileId, version, name, md5, obselete) VALUES (?, ?, ?, ?, 0)"
connection.prepareStatement(del).use {
prepareStatement(del).use {
it.setInt(1, fileId)
it.setInt(2, version)
it.executeUpdate()
}
connection.prepareStatement(ins).use {
prepareStatement(ins).use {
it.setInt(1, fileId)
it.setInt(2, version)
it.setString(3, name)
it.setString(4, md5)
it.executeUpdate()
}
}

override fun close() {
connection.close()
}
}

private const val MINIMUM_ZIP_DATE = 315532800000L // 1980-01-01
private val MINIMUM_ZIP_FILE_TIME = FileTime.fromMillis(MINIMUM_ZIP_DATE)

class Patcher(
val patchVersion: Int,
val targetDir: Path,
val db: FafDatabase,
val db: CoopDatabase,
val dryRun: Boolean,
) {
/**
Expand Down Expand Up @@ -315,16 +271,22 @@ class Patcher(

val tmp = Files.createTempFile("coop", ".zip")
log.info("Zipping sources with base={} -> {}", base, tmp)
zipPreserveStructure(existing, tmp, base)
val newChecksums = zipPreserveStructure(existing, tmp, base)

val newMd5 = tmp.md5()
// Compare checksums.md5 content with existing ZIP (if any)
val oldFile = db.getCurrentPatchFile(mod, fileId)
val existingZip = oldFile?.let { outDir.resolve(it.name) }
val oldChecksums = existingZip?.let { extractChecksumsFromZip(it) }

if (newMd5 == oldFile?.md5) {
if (newChecksums == oldChecksums) {
log.info("{} unchanged from version {}, skipping", name, oldFile.version)
Files.deleteIfExists(tmp)
return
}

// ZIP content changed - compute MD5 for database record
val newMd5 = tmp.md5()

if (!dryRun) {
log.info("Moving zip to {}", target)
Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING)
Expand All @@ -334,21 +296,10 @@ class Patcher(
db.insertOrReplace(mod, fileId, patchVersion, name, newMd5)
} else {
log.info("[DRYRUN] Would move {} -> {}", tmp, target)
Files.deleteIfExists(tmp)
}
}

private fun Path.md5(): String {
val md = MessageDigest.getInstance("MD5")
this.inputStream().use { input ->
val buf = ByteArray(4096)
var r: Int
while (input.read(buf).also { r = it } != -1) {
md.update(buf, 0, r)
}
}
return md.digest().joinToString("") { "%02x".format(it) }
}

private fun Path.commonPath(other: Path): Path {
val a = toAbsolutePath().normalize()
val b = other.toAbsolutePath().normalize()
Expand All @@ -361,30 +312,55 @@ class Patcher(
else a.root.resolve(a.subpath(0, commonCount))
}

private fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path) {
/**
* Create a ZIP archive with checksums.md5 embedded for content-based change detection.
* Returns the checksums.md5 content for comparison purposes.
*/
private fun zipPreserveStructure(sources: List<Path>, outputFile: Path, base: Path): String {
Files.createDirectories(outputFile.parent)

// First, collect all files to include
val allFiles = mutableListOf<Path>()
for (src in sources) {
if (!Files.exists(src)) {
log.warn("Could not find path {}", src)
continue
}
if (Files.isDirectory(src)) {
Files.walk(src).use { stream ->
stream.filter { Files.isRegularFile(it) }.forEach { allFiles.add(it) }
}
} else {
allFiles.add(src)
}
}

// Sort files for deterministic ordering
allFiles.sortBy { base.relativize(it).toString() }

// Generate checksums.md5 content
val checksums = generateChecksums(allFiles, base)

// Never pass a stream here; this will cause extended local headers to be used, making it incompatible to FA!
ZipArchiveOutputStream(outputFile.toFile()).use { zos ->
zos.setMethod(ZipArchiveEntry.DEFLATED)

for (src in sources) {
if (!Files.exists(src)) {
// skip
log.warn("Could not find path {}", src)
continue
}
if (Files.isDirectory(src)) {
Files.walk(src).use { stream ->
stream
.filter { Files.isRegularFile(it) }
.forEach { zos.pushNormalizedFile(base, it) }
}
} else {
zos.pushNormalizedFile(base, src)
}
// Write checksums.md5 as first entry
val checksumBytes = checksums.toByteArray()
val checksumEntry = ZipArchiveEntry(CHECKSUMS_FILENAME).apply {
size = checksumBytes.size.toLong()
}
zos.putArchiveEntry(checksumEntry)
zos.write(checksumBytes)
zos.closeArchiveEntry()

// Write all files
for (path in allFiles) {
zos.pushNormalizedFile(base, path)
}
}

return checksums
}

private fun ZipArchiveOutputStream.pushNormalizedFile(base: Path, path: Path) {
Expand All @@ -393,13 +369,7 @@ class Patcher(
val archiveName = base.relativize(path).toString().replace("\\", "/")

// Use the same constructor as the FAF API:
val entry = ZipArchiveEntry(path.toFile(), archiveName).apply {
// Ensure deterministic times
setTime(MINIMUM_ZIP_FILE_TIME)
setCreationTime(MINIMUM_ZIP_FILE_TIME)
setLastModifiedTime(MINIMUM_ZIP_FILE_TIME)
setLastAccessTime(MINIMUM_ZIP_FILE_TIME)
}
val entry = ZipArchiveEntry(path.toFile(), archiveName)

this.putArchiveEntry(entry)
Files.newInputStream(path).use { inp -> inp.copyTo(this) }
Expand All @@ -409,22 +379,18 @@ class Patcher(
}

fun main() {
Log.init()

val PATCH_VERSION = System.getenv("PATCH_VERSION") ?: error("PATCH_VERSION required")
val REPO_URL = System.getenv("GIT_REPO_URL") ?: "https://github.com/FAForever/fa-coop.git"
val GIT_REF = System.getenv("GIT_REF") ?: "v$PATCH_VERSION"
val WORKDIR = System.getenv("GIT_WORKDIR") ?: "/tmp/fa-coop-kt"
val WORKDIR = System.getenv("GIT_WORKDIR") ?: "/tmp/fa-coop"
val DRYRUN = (System.getenv("DRY_RUN") ?: "false").lowercase() in listOf("1", "true", "yes")

val DB_HOST = System.getenv("DATABASE_HOST") ?: "localhost"
val DB_NAME = System.getenv("DATABASE_NAME") ?: "faf"
val DB_USER = System.getenv("DATABASE_USERNAME") ?: "root"
val DB_PASS = System.getenv("DATABASE_PASSWORD") ?: "banana"

val TARGET_DIR = Paths.get("./legacy-featured-mod-files")

log.info("=== Kotlin Coop Deployer v{} ===", PATCH_VERSION)

val repo = FeatureModGitRepo(
val repo = GitRepo(
workDir = Paths.get(WORKDIR),
repoUrl = REPO_URL,
gitRef = GIT_REF
Expand Down Expand Up @@ -476,13 +442,7 @@ fun main() {
Patcher.PatchFile(25, "FAF_Coop_Operation_Tight_Spot_VO.v%d.nx2", null),
)

FafDatabase(
host = DB_HOST,
database = DB_NAME,
username = DB_USER,
password = DB_PASS,
dryRun = DRYRUN
).use { db ->
CoopDatabase(dryRun = DRYRUN).use { db ->
val patcher = Patcher(
patchVersion = PATCH_VERSION.toInt(),
targetDir = TARGET_DIR,
Expand Down
Loading
Loading