diff --git a/.github/workflows/docker-femiwiki.yml b/.github/workflows/docker-femiwiki.yml index 1cff460e..74b8e320 100644 --- a/.github/workflows/docker-femiwiki.yml +++ b/.github/workflows/docker-femiwiki.yml @@ -26,7 +26,7 @@ jobs: mv development/secret.php.example development/secret.php mv dockers/femiwiki/LocalSettings.php development mv dockers/femiwiki/Hotfix.php development - sed -i -r 's~ghcr\.io\/femiwiki\/mediawiki:.+~ghcr\.io\/femiwiki\/mediawiki:docker-test~' docker-compose.yml + sed -i -r 's~ghcr\.io\/femiwiki\/femiwiki:.+~ghcr\.io\/femiwiki\/femiwiki:docker-test~' docker-compose.yml - run: | echo "version=$(date +%Y-%m-%dT%H-%M)-$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_OUTPUT @@ -36,11 +36,11 @@ jobs: with: context: '{{ defaultContext }}:dockers/femiwiki' platforms: linux/amd64 - cache-from: ghcr.io/femiwiki/mediawiki:latest + cache-from: ghcr.io/femiwiki/femiwiki:latest cache-to: mode=max,type=local,dest=/tmp/.buildx-cache load: true push: false - tags: ghcr.io/femiwiki/mediawiki:docker-test + tags: ghcr.io/femiwiki/femiwiki:docker-test - name: Initialize docker swarm and start services run: | @@ -96,7 +96,7 @@ jobs: context: '{{defaultContext}}:dockers/femiwiki' platforms: linux/amd64,linux/arm64 cache-from: | - ghcr.io/femiwiki/mediawiki:latest + ghcr.io/femiwiki/femiwiki:latest type=local,src=/tmp/.buildx-cache cache-to: mode=max,type=inline load: false diff --git a/docker-compose.yml b/docker-compose.yml index 0b43da6a..0aaf3af0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: http: - image: ghcr.io/femiwiki/femiwiki:latest + image: ghcr.io/femiwiki/femiwiki:dev command: caddy run ports: - 8080:8080 @@ -21,7 +21,7 @@ services: options: max-size: '100m' fastcgi: - image: ghcr.io/femiwiki/femiwiki:latest + image: ghcr.io/femiwiki/femiwiki:dev volumes: # Mount secret.php, LocalSettings.php and site-list.xml - ./development:/a:ro