feat(docker): switch to opencontainer labels

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: garethflowers

.github/workflows/publish-docker-images.yml

@@ -0,0 +1,30 @@
+name: Publish Docker Images
+on:
+  push:
+    branches: [ master ]
+  release:
+    types: [ published ]
+jobs:
+  push_to_registries:
+    name: Push Docker images
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: garethflowers/mediawiki-ldap
+          add_git_labels: true
+          tag_with_ref: true
+      - name: Push to GitHub Packages
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
+          repository: ${{ github.repository }}/mediawiki-ldap
+          add_git_labels: true
+          tag_with_ref: true

.travis.yml

@@ -1,15 +0,0 @@
-language: bash
-
-addons:
-  apt:
-    update: true
-
-services:
-  - docker
-
-install:
-  - docker build --tag mediawiki-ldap .
-  - docker run --detach --publish 80:80 mediawiki-ldap
-
-script:
-  - wget --spider http://localhost:80

Dockerfile

@@ -4,18 +4,16 @@ ARG BUILD_DATE
 ARG VERSION
 ARG VCS_REF
 
-LABEL org.label-schema.build-date=$BUILD_DATE \
+LABEL org.opencontainers.image.authors="Gareth Flowers" \
-	org.label-schema.docker.cmd="docker run --detach --publish 80:80 garethflowers/mediawiki-ldap" \
+	org.opencontainers.image.description="MediaWiki with LDAP Extensions" \
-	org.label-schema.description="MediaWiki with LDAP Extensions" \
+	org.opencontainers.image.licenses="MIT" \
-	org.label-schema.name="mediawiki-ldap" \
+	org.opencontainers.image.title="mediawiki-ldap" \
-	org.label-schema.schema-version="1.0" \
+	org.opencontainers.image.url="https://github.com/garethflowers/docker-mediawiki-ldap" \
-	org.label-schema.url="https://www.mediawiki.org/wiki/MediaWiki" \
+	org.opencontainers.image.vendor="garethflowers"
-	org.label-schema.vcs-ref=$VCS_REF \
-	org.label-schema.vcs-url="https://github.com/garethflowers/docker-mediawiki-ldap" \
-	org.label-schema.vendor="garethflowers" \
-	org.label-schema.version=$VERSION
 
 RUN apt-get update \
-	&& apt-get install -y --no-install-recommends libldap2-dev libpq-dev \
+	&& apt-get install --yes --no-install-recommends libldap2-dev libpq-dev \
 	&& docker-php-ext-install ldap pgsql pdo pdo_pgsql \
-	&& rm -rf /var/lib/apt/lists
+	&& rm -rf /var/lib/apt/lists \
+	&& curl https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_31-8e93a3e.tar.gz --output /tmp/ldapprovider.tar.gz \
+	&& tar --extract --file=/tmp/ldapprovider.tar.gz --directory=/var/www/html/extensions

README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/garethflowers/docker-mediawiki-ldap.svg?branch=master)](https://travis-ci.org/garethflowers/mediawiki-ldap) [![Version](https://images.microbadger.com/badges/version/garethflowers/mediawiki-ldap.svg)](https://microbadger.com/images/garethflowers/mediawiki-ldap) [![Image Layers](https://images.microbadger.com/badges/image/garethflowers/mediawiki-ldap.svg)](https://microbadger.com/images/garethflowers/mediawiki-ldap) [![Docker Pulls](https://img.shields.io/docker/pulls/garethflowers/mediawiki-ldap.svg)](https://store.docker.com/community/images/garethflowers/mediawiki-ldap)
-
 # MediaWiki with LDAP
 
 A MediaWiki installation with LDAP extensions.

VERSION

@@ -1 +0,0 @@
-0.0.1

hooks/build

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-docker build \
-	--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-	--build-arg VCS_REF=`git rev-parse --short HEAD` \
-	--build-arg VERSION=`cat VERSION` \
-	--file $DOCKERFILE_PATH \
-	--tag $IMAGE_NAME \
-	.

hooks/post_push

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ $DOCKER_TAG =~ ^(([0-9]+).[0-9]+).[0-9]+$ ]]
-then
-	docker tag $IMAGE_NAME $DOCKER_REPO:${BASH_REMATCH[1]}
-	docker push $DOCKER_REPO:${BASH_REMATCH[1]}
-
-	docker tag $IMAGE_NAME $DOCKER_REPO:${BASH_REMATCH[2]}
-	docker push $DOCKER_REPO:${BASH_REMATCH[2]}
-
-	docker tag $IMAGE_NAME $DOCKER_REPO:latest
-	docker push $DOCKER_REPO:latest
-fi
-
-curl --request POST https://hooks.microbadger.com/images/garethflowers/mediawiki-ldap/nE-ecjjtvisVdmZcJ21nacrxk6I= || true