feat: switch to gitflow

Author: BertrandGouny

.travis.yml

@@ -28,6 +28,9 @@ before_install:
   - 'echo "  \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
   - 'echo "}" >> $HOME/.docker/config.json'
   - sudo service docker restart
+  # To have `DOCKER_USER` and `DOCKER_PASS`
+  # use `travis env set`.
+  - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
 
 install:
   # For cross buidling our images
@@ -51,9 +54,11 @@ before_script:
   - if [ -n "$TRAVIS_TAG" ]; then
     VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
     fi
-  - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+  - if [ "${TRAVIS_BRANCH}" == 'master' ]; then
     VERSION="stable";
     fi
+  # replace / with - in version
+  - VERSION=$(echo "${VERSION}" | sed 's|/|-|g');
 
 script:
   - make build-nocache NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
@@ -64,9 +69,6 @@ before_deploy:
   - docker run -d --name test_image ${NAME}:${VERSION}-${TARGET_ARCH} sleep 10
   - sleep 5
   - sudo docker ps | grep -q test_image
-  # To have `DOCKER_USER` and `DOCKER_PASS`
-  # use `travis env set`.
-  - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
   - make tag NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
 
 deploy:
@@ -81,21 +83,21 @@ jobs:
       install: skip
       script: skip
       after_deploy:
-        - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+        - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
         - docker manifest create ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
           docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
           docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
           docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
 
-        # The latest tag is coming from the stable branch of the repo
-        - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+        # The latest tag is coming from the master branch of the repo
+        - if [ "${TRAVIS_BRANCH}" == 'master' ]; then
           docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
           docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
           docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
           docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
           fi
 
         - docker manifest push ${NAME}:${VERSION};
-          if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+          if [ "${TRAVIS_BRANCH}" == 'master' ]; then
           docker manifest push ${NAME}:latest;
           fi

image/Dockerfile

@@ -2,8 +2,8 @@ FROM osixia/openldap:1.4.0
 
 # Install cron from baseimage and remove .cfss and slapd services inherited from openldap image
 # remove also previous default environment files, they are not needed.
-# sources: https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-service-available
-#          https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:cron/download.sh
+# sources: https://github.com/osixia/docker-light-baseimage/blob/master/image/tool/add-service-available
+#          https://github.com/osixia/docker-light-baseimage/blob/master/image/service-available/:cron/download.sh
 RUN apt-get -y update \
 	&& /container/tool/add-multiple-process-stack \
 	&& apt-get install -y awscli \
@@ -14,7 +14,7 @@ RUN apt-get -y update \
 ADD service /container/service
 
 # Use baseimage install-service script
-# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service
+# https://github.com/osixia/docker-light-baseimage/blob/master/image/tool/install-service
 RUN /container/tool/install-service
 
 # Add default env variables

image/service/slapd-backup/startup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # set -x (bash debug) if log level is trace
-# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
+# https://github.com/osixia/docker-light-baseimage/blob/master/image/tool/log-helper
 log-helper level eq trace && set -x
 
 # add image tools to path