prepare 10.4.22 and move to dockerized

This commit is contained in:
Wolfgang Hottgenroth 2022-02-11 12:42:45 +01:00
parent a41275c49b
commit 551b6d328d
2 changed files with 8 additions and 31 deletions

View File

@ -1,25 +1,4 @@
image: docker:stable include:
- project: dockerized/commons
stages: ref: master
- build file: gitlab-ci-template.yml
variables:
IMAGE_NAME: registry.gitlab.com/wolutator/mariadb-with-ldap-pam
HUB_IMAGE_NAME: wollud1969/mariadb-with-ldap-pam
build:
stage: build
tags:
- hottis
- linux
- docker
script:
- VERSION=`cat VERSION`
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:$VERSION
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
- docker push $HUB_IMAGE_NAME:latest
- docker push $HUB_IMAGE_NAME:$VERSION

View File

@ -1,8 +1,6 @@
FROM mariadb:10.4 FROM mariadb:10.4.22
LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>" LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
LABEL ImageName="registry.gitlab.com/wolutator/mariadb-with-ldap-pam"
LABEL AlternativeImageName="wollud1969/mariadb-with-ldap-pam"
ENV LDAPBASE "DC=hottis,DC=de" ENV LDAPBASE "DC=hottis,DC=de"
ENV LDAPURI "ldap://ldap.hottis.de:389" ENV LDAPURI "ldap://ldap.hottis.de:389"
@ -10,9 +8,9 @@ ENV LDAPBINDDB ""
ENV LDAPBINDPW "" ENV LDAPBINDPW ""
RUN \ RUN \
apt-get update && \ apt update && \
env DEBIAN_FRONTEND=noninteractive apt-get -yq install libpam-ldap && \ env DEBIAN_FRONTEND=noninteractive apt -yq install libpam-ldap && \
env DEBIAN_FRONTEND=noninteractive apt-get -yq install pamtester env DEBIAN_FRONTEND=noninteractive apt -yq install pamtester
COPY docker-entrypoint.sh-head /usr/local/bin COPY docker-entrypoint.sh-head /usr/local/bin
COPY pam.conf-tail /etc COPY pam.conf-tail /etc