Compare commits

..

10 commits

Author SHA1 Message Date
d1dd0d7760 cleanup build file for production use
Some checks failed
thrrgilag/prosody-docker/pipeline/head This commit looks good
git.dreamfall.space/prosody-docker/pipeline/head There was a failure building this commit
2023-11-10 11:17:39 -08:00
592ed4e8c7 fix build label
All checks were successful
thrrgilag/prosody-docker/pipeline/head This commit looks good
2023-11-10 10:00:30 -08:00
78a3d57bd6 test notificaiton and tag strategy
Some checks reported errors
thrrgilag/prosody-docker/pipeline/head Something is wrong with the build of this commit
2023-11-10 09:58:31 -08:00
2bba2cba00 try again with diff creds
All checks were successful
thrrgilag/prosody-docker/pipeline/head This commit looks good
2023-11-09 17:59:41 -08:00
8566673a6f test again
Some checks failed
thrrgilag/prosody-docker/pipeline/head There was a failure building this commit
2023-11-09 17:40:35 -08:00
5610addfa6 test with different creds
Some checks failed
thrrgilag/prosody-docker/pipeline/head There was a failure building this commit
2023-11-09 16:24:29 -08:00
5fa67476aa test build
Some checks failed
thrrgilag/prosody-docker/pipeline/head There was a failure building this commit
2023-11-09 15:55:30 -08:00
45c7a894df pull latest plugin images
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-11-07 15:59:56 -08:00
8cda134e08 update tagging for docker build
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-11-07 08:05:18 -08:00
7fb7b4ea20 temporary revert to bullseye
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-11-06 15:55:58 -08:00
4 changed files with 10 additions and 32 deletions

View file

@ -1,16 +1,16 @@
pipeline: pipeline:
build: build:
image: woodpeckerci/plugin-docker-buildx image: woodpeckerci/plugin-docker-buildx:latest
settings: settings:
repo: git.dreamfall.space/${CI_REPO_OWNER}/prosody repo: git.dreamfall.space/${CI_REPO_OWNER}/prosody
registry: git.dreamfall.space registry: git.dreamfall.space
tag: latest auto_tag: true
username: ${CI_REPO_OWNER} username: ${CI_REPO_OWNER}
password: password:
from_secret: git_token from_secret: git_token
notify: notify:
image: deblan/woodpecker-email image: deblan/woodpecker-email:latest
settings: settings:
from: woodpecker@clacks.network from: woodpecker@clacks.network
host: smtp.migadu.com host: smtp.migadu.com

View file

@ -1,28 +1,18 @@
FROM debian:bookworm-slim FROM debian:bullseye-slim
RUN apt-get update && \ RUN apt-get update && \
apt-get install ca-certificates extrepo -y && \ apt-get install ca-certificates extrepo -y && \
extrepo enable prosody && \ extrepo enable prosody && \
apt-get update && \ apt-get update && \
apt-get install prosody prosody-modules lua5.4 liblua5.4-dev lua-luaossl -y apt-get install prosody prosody-modules -y
RUN mkdir -p /run/prosody/ && \ RUN mkdir -p /run/prosody/ && \
chown -R prosody:prosody /run/prosody/ chown -R prosody:prosody /run/prosody/
RUN mkdir -p /etc/prosody/conf.d/ RUN mkdir -p /etc/prosody/conf.d/
RUN update-alternatives --set lua-interpreter /usr/bin/lua5.4
COPY prosody.cfg.lua /etc/prosody/prosody.cfg.lua COPY prosody.cfg.lua /etc/prosody/prosody.cfg.lua
RUN mkdir -p /usr/local/prosody/custom_plugins/lib/luarocks/rocks-5.4
RUN chown -R prosody:prosody /usr/local/prosody
RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_cloud_notify_extensions
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_bind2
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_sm
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_fast
EXPOSE 5222 EXPOSE 5222
EXPOSE 5269 EXPOSE 5269
EXPOSE 5280 EXPOSE 5280

10
Jenkinsfile vendored
View file

@ -1,8 +1,7 @@
pipeline { pipeline {
agent none agent none
environment { environment {
CHAT = "spacenerdmo@clacks.network" CHAT = "devel@conference.mcmillian.dev"
MAIL = "morgan@mcmillian.dev"
} }
stages { stages {
stage('Build docker image') { stage('Build docker image') {
@ -13,8 +12,8 @@ pipeline {
steps { steps {
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Started', notifySuspects: true, targets: "${CHAT}" jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Started', notifySuspects: true, targets: "${CHAT}"
script { script {
docker.withRegistry('https://git.dreamfall.space/spacenerdmo', 'spacenerdmo-pkg-pub') { docker.withRegistry('https://git.dreamfall.space/thrrgilag', 'thrrgilag-forgejo-pkg') {
def customImage = docker.build("git.dreamfall.space/spacenerdmo/prosody:${TAG}") def customImage = docker.build("git.dreamfall.space/thrrgilag/prosody:${TAG}")
customImage.push() customImage.push()
} }
} }
@ -25,9 +24,6 @@ pipeline {
} }
failure { failure {
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Failed', notifySuspects: true, targets: "${CHAT}" jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Failed', notifySuspects: true, targets: "${CHAT}"
mail to: "${MAIL}",
subject: "Deploy Failed: ${currentBuild.fullDisplayName}",
body: "Something is wrong with ${env.BUILD_URL}"
} }
} }
} }

View file

@ -25,8 +25,7 @@ admins = { }
-- This option allows you to specify additional locations where Prosody -- This option allows you to specify additional locations where Prosody
-- will search first for modules. For additional modules you can install, see -- will search first for modules. For additional modules you can install, see
-- the community module repository at https://modules.prosody.im/ -- the community module repository at https://modules.prosody.im/
--plugin_paths = { } --plugin_paths = {}
installer_plugin_path = "/usr/local/prosody/custom_plugins"
-- This is the list of modules Prosody will load on startup. -- This is the list of modules Prosody will load on startup.
-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
@ -51,8 +50,7 @@ modules_enabled = {
"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
-- Nice to have -- Nice to have
-- "csi_simple"; -- Simple but effective traffic optimizations for mobile devices "csi_simple"; -- Simple but effective traffic optimizations for mobile devices
"csi_battery_saver";
"invites"; -- Create and manage invites "invites"; -- Create and manage invites
"invites_adhoc"; -- Allow admins/users to create invitations via their client "invites_adhoc"; -- Allow admins/users to create invitations via their client
"invites_register"; -- Allows invited users to create accounts "invites_register"; -- Allows invited users to create accounts
@ -74,12 +72,6 @@ modules_enabled = {
"websocket"; -- XMPP over WebSockets "websocket"; -- XMPP over WebSockets
-- Other specific functionality -- Other specific functionality
"cloud_notify";
"cloud_notify_extensions";
--"sasl2";
--"sasl2_bind2";
--"sasl2_sm";
--"sasl2_fast";
--"announce"; -- Send announcement to all online users --"announce"; -- Send announcement to all online users
--"groups"; -- Shared roster support --"groups"; -- Shared roster support
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.