bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-24 10:59:07 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: bn8:2d08374a535a65b384c9eb8d2d0785454edf3c0a
Branches Tags
bn8:master
bn8:doc
bn8:jsonCompositeAttribute
bn8:adminlte
bn8:4.2.0-1
bn8:4.1.0-1
bn8:4.0.0-1
bn8:3.0.2-1
bn8:3.0.1-1
bn8:3.0.0-1
bn8:2.4.1-0
bn8:2.4.0-0
bn8:2.3-0
bn8:2.2-0
bn8:2.1-0
bn8:2.0-0
bn8:1.8-6
bn8:1.8-5
bn8:1.8-4
bn8:1.8-3
bn8:1.8-2
bn8:1.8-1
bn8:1.7-2
bn8:1.7-1
bn8:1.6-1
bn8:1.5-2
bn8:1.5-1
bn8:1.4-2
bn8:1.4-1
bn8:1.3-2
bn8:1.3-1
bn8:1.2-1
bn8:1.1-6
bn8:1.1-5
bn8:1.1-4
bn8:1.1-3
bn8:1.1-2
bn8:1.1-1
bn8:1.0-11
bn8:1.0-10
bn8:1.0-9
bn8:1.0-8
bn8:1.0-7
bn8:1.0-6
bn8:1.0-5
bn8:1.0-4
bn8:1.0-3
bn8:1.0-2
bn8:1.0-1
..
compare: bn8:ef94f4dd70b6ffd60732357409aff06e2135bd9c
Branches Tags
bn8:doc
bn8:master
bn8:jsonCompositeAttribute
bn8:adminlte
bn8:4.2.0-1
bn8:4.1.0-1
bn8:4.0.0-1
bn8:3.0.2-1
bn8:3.0.1-1
bn8:3.0.0-1
bn8:2.4.1-0
bn8:2.4.0-0
bn8:2.3-0
bn8:2.2-0
bn8:2.1-0
bn8:2.0-0
bn8:1.8-6
bn8:1.8-5
bn8:1.8-4
bn8:1.8-3
bn8:1.8-2
bn8:1.8-1
bn8:1.7-2
bn8:1.7-1
bn8:1.6-1
bn8:1.5-2
bn8:1.5-1
bn8:1.4-2
bn8:1.4-1
bn8:1.3-2
bn8:1.3-1
bn8:1.2-1
bn8:1.1-6
bn8:1.1-5
bn8:1.1-4
bn8:1.1-3
bn8:1.1-2
bn8:1.1-1
bn8:1.0-11
bn8:1.0-10
bn8:1.0-9
bn8:1.0-8
bn8:1.0-7
bn8:1.0-6
bn8:1.0-5
bn8:1.0-4
bn8:1.0-3
bn8:1.0-2
bn8:1.0-1

4 commits
2d08374a53 ... ef94f4dd70

Author SHA1 Message Date
Benjamin Renard
ef94f4dd70
Release 4.2.0-1 2023-10-26 14:23:30 +02:00
Benjamin Renard
717d424f76
CI: fully specified image names 2023-10-26 14:23:00 +02:00
Benjamin Renard
982d29aa63
CI: publish a new release in Gitlab on new tag 2023-10-26 14:20:40 +02:00
Benjamin Renard
f6fa5a2d96
CI: add build & publish step for debian stable package 2023-10-26 12:52:19 +02:00
8 changed files with 11 additions and 44 deletions
Show stats Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -122,8 +122,8 @@ build:debian-stable:
cache: cache:
paths: paths:
- .cache/pip - .cache/pip
only: rules:
- tags - if: $CI_COMMIT_TAG != null && $CI_COMMIT_BRANCH == "master"
script: script:
- ./build-deb.sh --install-build-deps - ./build-deb.sh --install-build-deps
- rm -fr dist/ldapsaisie-* - rm -fr dist/ldapsaisie-*
@ -289,8 +289,8 @@ publish:debian-stable:
image: docker.io/debian:stable-slim image: docker.io/debian:stable-slim
needs: needs:
- build:debian-stable - build:debian-stable
only: rules:
- tags - if: $CI_COMMIT_TAG != null && $CI_COMMIT_BRANCH == "master"
before_script: before_script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends rsync openssh-client dupload - apt-get install -y --no-install-recommends rsync openssh-client dupload
@ -310,8 +310,8 @@ publish:gitlab:
entrypoint: ["/bin/sh", "-c"] entrypoint: ["/bin/sh", "-c"]
needs: needs:
- build:debian-stable - build:debian-stable
only: rules:
- tags - if: $CI_COMMIT_TAG != null && $CI_COMMIT_BRANCH == "master"
script: script:
- ./.gitlab/publish.sh - ./.gitlab/publish.sh
artifacts: artifacts:
@ -345,7 +345,7 @@ release:
entrypoint: ["/bin/sh", "-c"] entrypoint: ["/bin/sh", "-c"]
needs: needs:
- publish:gitlab - publish:gitlab
only: rules:
- tags - if: $CI_COMMIT_TAG != null && $CI_COMMIT_BRANCH == "master"
script: script:
- ./.gitlab/release.sh - ./.gitlab/release.sh

3
build-deb.sh
View file

@ -114,11 +114,10 @@ $GITDCH \
--code-name $DEBIAN_CODENAME \ --code-name $DEBIAN_CODENAME \
--output $DIST_DIR/debian/changelog \ --output $DIST_DIR/debian/changelog \
--release-notes ../release-notes.md \ --release-notes ../release-notes.md \
--exclude "^Docker: " \
--exclude "^CI: " \ --exclude "^CI: " \
--exclude "^debian: " \ --exclude "^debian: " \
--exclude "\.gitlab-ci\.yml" \ --exclude "\.gitlab-ci\.yml" \
--exclude "build-deb\.sh" \ --exclude "build\.sh" \
--exclude "README\.md" \ --exclude "README\.md" \
--exclude "^Merge branch " \ --exclude "^Merge branch " \
--verbose "${GITDCH_EXTRA_ARGS[@]}" --verbose "${GITDCH_EXTRA_ARGS[@]}"

2
debian/changelog vendored
View file

@ -18,7 +18,7 @@ ldapsaisie (4.2.0-1) stable; urgency=medium
* supann: Add supannCMSIdEtiquette attribute support * supann: Add supannCMSIdEtiquette attribute support
* doc: switch format to Markdown & Mkdocs * doc: switch format to Markdown & Mkdocs
-- LdapSaisie project <support+ldapsaisie@easter-eggs.com> Thu, 26 Oct 2023 11:55:52 +0200 -- Benjamin Renard <brenard@easter-eggs.com> Thu, 26 Oct 2023 11:55:52 +0200
ldapsaisie (4.1.0-1) unstable; urgency=medium ldapsaisie (4.1.0-1) unstable; urgency=medium

1
docker/Dockerfile.common → docker/Dockerfile
View file

@ -1,3 +1,4 @@
FROM debian:11
# Update/upgrade # Update/upgrade
RUN apt-get update RUN apt-get update
RUN apt-get upgrade -y RUN apt-get upgrade -y

5
docker/Dockerfile.bookworm
View file

@ -1,5 +0,0 @@
# syntax = edrevo/dockerfile-plus
FROM debian:bookworm-slim
INCLUDE+ Dockerfile.common

5
docker/Dockerfile.bullseye
View file

@ -1,5 +0,0 @@
# syntax = edrevo/dockerfile-plus
FROM debian:bullseye-slim
INCLUDE+ Dockerfile.common

5
docker/Dockerfile.buster
View file

@ -1,5 +0,0 @@
# syntax = edrevo/dockerfile-plus
FROM debian:buster-slim
INCLUDE+ Dockerfile.common

18
docker/build-and-push-all.sh
View file

@ -1,18 +0,0 @@
#!/bin/bash
cd $( dirname $0 )
# Need to use Dockerfile+ (https://github.com/edrevo/dockerfile-plus)
export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1
DISTS=(bookworm bullseye buster)
LATEST_DIST=${DISTS[0]}
for dist in ${DISTS[@]}
do
docker build -t brenard/ldapsaisie:$dist -f Dockerfile.$dist .
[ $? -eq 0 ] && docker push brenard/ldapsaisie:$dist
done
docker build -t brenard/ldapsaisie:latest -f Dockerfile.$LATEST_DIST .
[ $? -eq 0 ] && docker push brenard/ldapsaisie:latest