Merge pull request #468 from open-zaak/release/1.0.0

Draft 1.0.0 release
open-zaak · Feb 6, 2020 · 1934b41 · 1934b41
2 parents 59e40b2 + 61bd482
commit 1934b41
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 0.9.0
+current_version = 1.0.0
 
 [bumpversion:file:README.rst]
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,10 +1,10 @@
 Changelog
 =========
 
-1.0.0 (TDB)
------------
+1.0.0 (2020-02-06)
+------------------
 
-First release of Open Zaak.
+🎉 First release of Open Zaak.
 
 Features:
 

diff --git a/Dockerfile b/Dockerfile
@@ -62,5 +62,9 @@ ARG SECRET_KEY=dummy
 # Run collectstatic, so the result is already included in the image
 RUN python src/manage.py collectstatic --noinput
 
+LABEL org.label-schema.vcs-ref=$COMMIT_HASH \
+      org.label-schema.vcs-url="https://github.com/open-zaak/open-zaak" \
+      org.label-schema.name="Open Zaak"
+
 EXPOSE 8000
 CMD ["/start.sh"]
diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 Open Zaak
 =========
 
-:Version: 0.9.0
+:Version: 1.0.0
 :Source: https://github.com/open-zaak/open-zaak
 :Keywords: zaken, zaakgericht werken, zaken-api, catalogi-api, besluiten-api, documenten-api
 :PythonVersion: 3.7

diff --git a/bin/docker_push.sh b/bin/docker_push.sh
@@ -9,6 +9,8 @@
 set -eu
 set +x
 
+git_hash=${TRAVIS_COMMIT:-`git rev-parse HEAD`}
+
 # Login to Docker Hub
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
@@ -21,6 +23,7 @@ TAG=${1:-latest}
 # Build the image
 docker build \
     -t $REPO:$TAG \
+    --build-arg COMMIT_HASH=$git_hash
     .
 
 # Push the image

diff --git a/deployment/kubernetes/apps.yml b/deployment/kubernetes/apps.yml
@@ -15,7 +15,7 @@
   roles:
     - role: open_zaak_k8s
       vars:  # these override vars_files
-        openzaak_version: '0.9.0'
+        openzaak_version: '1.0.0'
         openzaak_db_host: "{{ db.privateIp }}"
         openzaak_db_port: "{{ db.port }}"
       tags:

diff --git a/deployment/single-server/open-zaak.yml b/deployment/single-server/open-zaak.yml
@@ -61,7 +61,7 @@
 
     - role: open_zaak_docker
       vars:
-        openzaak_version: '0.9.0'  # see https://hub.docker.com/r/openzaak/open-zaak/tags
+        openzaak_version: '1.0.0'  # see https://hub.docker.com/r/openzaak/open-zaak/tags
       tags:
         - replicas
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openzaak",
-  "version": "0.9.0",
+  "version": "1.0.0",
   "description": "Open Zaak",
   "main": "src/index.js",
   "directories": {