diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..2cf07b5 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,21 @@ +image: egon0/docker-with-buildx-and-git:latest + +variables: + DOCKER_HOST: tcp://docker:2375/ + DOCKER_DRIVER: overlay2 + DOCKER_TLS_CERTDIR: "" + +services: + - docker:dind + +build: + stage: build + variables: + IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + D_IMAGE_TAG: egon0/prosody-alpine-ldap-multiarch:$CI_COMMIT_REF_SLUG + D_LATEST_TAG: egon0/prosody-alpine-ldap-multiarch:latest + script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD + - docker buildx create --use --name A$CI_COMMIT_SHORT_SHA + - docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $D_IMAGE_TAG -t $D_LATEST_TAG . diff --git a/Dockerfile b/Dockerfile index 5f813cf..e9dea06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ -FROM alpine:3.10.0 -MAINTAINER Jochen Schalanda - -ENV PROSODY_VERSION 0.11.2-r0 +FROM alpine:3.16 +MAINTAINER Micha Gläß-Stöcker # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE @@ -13,13 +11,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.description="Prosody IM Docker image based on Alpine Linux" \ org.label-schema.url="https://prosody.im/" \ org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/joschi/docker-prosody-alpine" \ org.label-schema.version=$VERSION \ org.label-schema.schema-version="1.0" \ com.microscaling.docker.dockerfile="/Dockerfile" \ com.microscaling.license="MIT" -RUN apk add --no-cache bash "prosody=${PROSODY_VERSION}" +RUN apk add --no-cache bash "prosody" lua5.2-ldap RUN mkdir -p /etc/prosody/conf.d /usr/local/lib/prosody/modules COPY prosody.cfg.lua /etc/prosody/prosody.cfg.lua diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..7190a60 --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json" +}