Release 4.2.0-1

.gitlab-ci.yml

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

build-deb.sh

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

debian/changelog

@@ -18,7 +18,7 @@ ldapsaisie (4.2.0-1) stable; urgency=medium
     * supann: Add supannCMSIdEtiquette attribute support
   * 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
 

docker/Dockerfile

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

docker/Dockerfile.bookworm

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

docker/Dockerfile.bullseye

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

docker/Dockerfile.buster

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

docker/build-and-push-all.sh

@@ -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