diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aedfbb1..6239ee0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -48,7 +48,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - platforms: linux/amd64,linux/arm/v7,linux/ppc64le # linux/386,linux/arm/v6,linux/arm64,linux/s390x + platforms: linux/amd64,linux/arm/v7,linux/ppc64le push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.prep.outputs.tags }} labels: ${{ steps.prep.outputs.labels }} diff --git a/README.md b/README.md index 9c72923..a453640 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,9 @@ A MediaWiki installation with LDAP extensions. ### Start a MediaWiki Server instance To start a container use the following: + +#### ...via `docker run` + ```sh docker run \ --name my-mediawiki-ldap \ @@ -15,6 +18,16 @@ docker run \ garethflowers/mediawiki-ldap ``` +#### ...via `docker compose` + +```yml +services: + my-mediawiki-ldap: + image: garethflowers/mediawiki-ldap + ports: + - 80:80/tcp +``` + ## License * MediaWiki is released under the [GNU GPLv2 License](https://phabricator.wikimedia.org/source/mediawiki/browse/master/COPYING). diff --git a/test/docker-compose.yml b/docker-compose.yml similarity index 71% rename from test/docker-compose.yml rename to docker-compose.yml index d413102..8a5a29d 100644 --- a/test/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,3 @@ services: build: . command: php -v image: garethflowers/mediawiki-ldap -networks: - default: - driver: bridge diff --git a/test/test.sh b/test/test.sh deleted file mode 100755 index 8bb2b4b..0000000 --- a/test/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -ex -export IMAGE_NAME=garethflowers/mediawiki-ldap - -docker build --progress plain --tag $IMAGE_NAME . -docker run --rm $IMAGE_NAME php -v - -echo "\nOK"