Răsfoiți Sursa

Merge remote-tracking branch 'origin/stable' into release-1.4.0

Bertrand Gouny 6 ani în urmă
părinte
comite
f40a5e354b
2 a modificat fișierele cu 6 adăugiri și 1 ștergeri
  1. 4 1
      .travis.yml
  2. 2 0
      CHANGELOG.md

+ 4 - 1
.travis.yml

@@ -44,8 +44,8 @@ install:
 
 before_script:
   # Set baseimage.
-  # remove pqchecker if arch is not amd64
   - sed -i -e "s/FROM \(.*\)/FROM \1-${TARGET_ARCH}/g" image/Dockerfile;
+  # remove pqchecker if arch is not amd64
   - if [[ "${TARGET_ARCH}" != 'amd64' ]]; then
     sed -i -e "/PQCHECKER/Id" image/Dockerfile;
     fi
@@ -55,6 +55,9 @@ before_script:
   - if [ -n "$TRAVIS_TAG" ]; then
     VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
     fi
+  - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+    VERSION="stable";
+    fi
 
 script:
   - make build-nocache NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}

+ 2 - 0
CHANGELOG.md

@@ -252,6 +252,8 @@ Environment variable LDAP_REPLICATION_HDB_SYNCPROV changed to LDAP_REPLICATION_D
 ## [0.10.0] - 2015-03-03
 New version initial release, no changelog before this sorry.
 
+[1.3.0]: https://github.com/osixia/docker-openldap/compare/v1.2.5...v1.3.0
+[1.2.5]: https://github.com/osixia/docker-openldap/compare/v1.2.4...v1.2.5
 [1.2.4]: https://github.com/osixia/docker-openldap/compare/v1.2.3...v1.2.4
 [1.2.3]: https://github.com/osixia/docker-openldap/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/osixia/docker-openldap/compare/v1.2.1...v1.2.2