Add IRC bridging + other production stuff

.gitignore

@@ -0,0 +1,3 @@
+# Kubernetes deployment secrets
+kubernetes/ocf-kubernetes-deploy-secret-*.erb
+secret.yaml

Dockerfile.bridge

@@ -0,0 +1,6 @@
+ARG bridge_version=latest
+FROM matrixdotorg/matrix-appservice-irc:${bridge_version}
+
+# Unset ENTRYPOINT for easier operability in the image
+ENTRYPOINT []
+CMD ["/app/docker/start.sh"]

Dockerfile → Dockerfile.matrix

@@ -1,4 +1,4 @@
 ARG synapse_version=latest
 FROM matrixdotorg/synapse:${synapse_version}
 
-COPY homeserver.yaml /etc/matrix/homeserver.yaml
+COPY synapse.log.config /etc/matrix/synapse.log.config

Jenkinsfile

@@ -1,5 +1,5 @@
 servicePipeline(
-    upstreamProjects: ['dockers/master'],
+    upstreamProjects: [],
 )
 
 // vim: ft=groovy

Makefile

@@ -1,18 +1,22 @@
 DOCKER_REVISION ?= matrix-testing-$(USER)
+
 SYNAPSE_DOCKER_TAG = docker-push.ocf.berkeley.edu/synapse:$(DOCKER_REVISION)
+BRIDGE_DOCKER_TAG = docker-push.ocf.berkeley.edu/matrix-appservice-irc:$(DOCKER_REVISION)
 RIOT_DOCKER_TAG = docker-push.ocf.berkeley.edu/riot:$(DOCKER_REVISION)
-RANDOM_PORT := $(shell expr $$(( 8000 + (`id -u` % 1000) + 2 )))
 
-SYNAPSE_VERSION := v1.9.1-py3
+SYNAPSE_VERSION := v1.12.4-py3
 RIOT_VERSION := v1.5.15
+BRIDGE_VERSION := release-0.17.0-rc4
 
 .PHONY: cook-image
 cook-image:
-	docker build --build-arg synapse_version=$(SYNAPSE_VERSION) --pull -t $(SYNAPSE_DOCKER_TAG) .
-	docker build -f Dockerfile.riot --build-arg riot_version=$(RIOT_VERSION) --pull -t $(RIOT_DOCKER_TAG) .
+	docker build --build-arg synapse_version=$(SYNAPSE_VERSION) --pull -f Dockerfile.matrix -t $(SYNAPSE_DOCKER_TAG) .
+	docker build --build-arg bridge_version=$(BRIDGE_VERSION) --pull -f Dockerfile.bridge -t $(BRIDGE_DOCKER_TAG) .
+	docker build --build-arg riot_version=$(RIOT_VERSION) --pull -f Dockerfile.riot -t $(RIOT_DOCKER_TAG) .
 
 .PHONY: push-image
 push-image:
 	docker push $(SYNAPSE_DOCKER_TAG)
+	docker push $(BRIDGE_DOCKER_TAG)
 	docker push $(RIOT_DOCKER_TAG)
 

config.riot.json

@@ -2,7 +2,7 @@
     "default_server_config": {
         "m.homeserver": {
             "base_url": "https://matrix.ocf.berkeley.edu",
-            "server_name": "matrix.ocf.berkeley.edu"
+            "server_name": "ocf.berkeley.edu"
         },
         "m.identity_server": {
             "base_url": "https://vector.im"
@@ -35,11 +35,11 @@
     "default_theme": "dark",
     "roomDirectory": {
         "servers": [
-            "matrix.ocf.berkeley.edu",
+            "ocf.berkeley.edu",
             "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false
     }
-}
+}