diff --git a/.github/workflows/bump-mediawiki.yml b/.github/workflows/bump-mediawiki.yml index 88f7e9e..ba5c2cd 100644 --- a/.github/workflows/bump-mediawiki.yml +++ b/.github/workflows/bump-mediawiki.yml @@ -2,14 +2,14 @@ name: Bump MW on: repository_dispatch: - types: [bump-mediawiki] + types: [bump-femiwiki] workflow_dispatch: inputs: tag: type: string jobs: - bump-mediawiki: + bump-femiwiki: concurrency: group: ${{ github.workflow }} cancel-in-progress: true @@ -40,14 +40,14 @@ jobs: cd jobs hcledit attribute set -f fastcgi.nomad \ -u job.fastcgi.group.fastcgi.task.fastcgi.config.image \ - '"ghcr.io/femiwiki/mediawiki:${{fromJSON(steps.vars.outputs.result).tag}}"' + '"ghcr.io/femiwiki/femiwiki:${{fromJSON(steps.vars.outputs.result).tag}}"' - name: Create Pull Request uses: peter-evans/create-pull-request@v6 with: token: ${{secrets.BOT_TOKEN}} - commit-message: Bump mediawiki docker image - title: Bump MediaWiki docker image + commit-message: Bump femiwiki docker image + title: Bump femiwiki docker image body: | ### pre-merge diff --git a/jobs/development/fastcgi.nomad b/jobs/development/fastcgi.nomad index 78d7570..0cdaa31 100644 --- a/jobs/development/fastcgi.nomad +++ b/jobs/development/fastcgi.nomad @@ -19,7 +19,7 @@ job "fastcgi" { driver = "docker" artifact { - source = "https://raw.githubusercontent.com/femiwiki/docker-mediawiki/main/configs/secret.php.example" + source = "https://raw.githubusercontent.com/femiwiki/docker-mediawiki/main/development/secret.php.example" destination = "secrets/secrets.php" mode = "file" } @@ -56,7 +56,7 @@ job "fastcgi" { } config { - image = "ghcr.io/femiwiki/mediawiki:latest" + image = "ghcr.io/femiwiki/femiwiki:latest" volumes = [ "secrets/secrets.php:/a/secret.php", diff --git a/jobs/development/http.nomad b/jobs/development/http.nomad index 95ee588..5716f82 100644 --- a/jobs/development/http.nomad +++ b/jobs/development/http.nomad @@ -54,7 +54,7 @@ job "http" { } config { - image = "ghcr.io/femiwiki/mediawiki:latest" + image = "ghcr.io/femiwiki/femiwiki:latest" command = "caddy" args = ["run"] diff --git a/jobs/fastcgi.nomad b/jobs/fastcgi.nomad index 52f489e..09069ea 100644 --- a/jobs/fastcgi.nomad +++ b/jobs/fastcgi.nomad @@ -75,7 +75,7 @@ job "fastcgi" { } config { - image = "ghcr.io/femiwiki/mediawiki:2023-11-12T00-34-e178b385" + image = "ghcr.io/femiwiki/femiwiki:2024-03-01T15-31-d2df3a49" volumes = [ "local/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini", @@ -116,7 +116,7 @@ job "fastcgi" { NOMAD_UPSTREAM_ADDR_memcached = "127.0.0.1:11211" MEDIAWIKI_SKIP_INSTALL = "1" MEDIAWIKI_SKIP_IMPORT_SITES = "1" - MEDIAWIKI_SKIP_UPDATE = "1" + # MEDIAWIKI_SKIP_UPDATE = "1" } } } diff --git a/jobs/http.nomad b/jobs/http.nomad index c28b12d..ce573c3 100644 --- a/jobs/http.nomad +++ b/jobs/http.nomad @@ -32,7 +32,7 @@ job "http" { } config { - image = "ghcr.io/femiwiki/mediawiki:2023-08-08T16-05-84cfc3ac" + image = "ghcr.io/femiwiki/femiwiki:2024-03-01T16-44-bf545c30" command = "caddy" args = ["run"]