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

Release/1.0.0

AUTHORS

@@ -15,8 +15,9 @@ better:
 A big THANK YOU goes to:
 
     All municipalities who initiated the project: Amsterdam, Rotterdam,
-    Utrecht, Tilburg, Arnhem, Haarlem, 's-Hertogenbosch, Delft and Hoorn.
+    Utrecht, Tilburg, Arnhem, Haarlem, 's-Hertogenbosch, Delft and a
+    combination of Hoorn, Medemblik, Stede Broec, Drechteland, Enkhuizen (SED)
 
     Dimpact for their excellent guidance and support.
 
-    All people behind Common Ground for their enthousiasm and vision.
+    All people behind Common Ground for their enthusiasm and vision.

CHANGELOG.rst

@@ -2,7 +2,21 @@
 Changes
 =======
 
-1.0.0 final (*tbd*)
-===================
+1.0.0 final (2020-02-07)
+========================
 
-* Initial release.
+🎉 First stable release of Open Notificaties.
+
+Features:
+
+* Notificaties API implementation
+* Tested with Open Zaak integration
+* Admin interface to view data created via the APIs
+* Scalable notification delivery workers
+* `NLX`_ ready (can be used with NLX)
+* Documentation on https://open-notificaties.readthedocs.io/
+* Deployable on Kubernetes, single server and as VMware appliance
+* Automated test suite
+* Automated deployment
+
+.. _NLX: https://nlx.io/

Dockerfile

@@ -51,7 +51,9 @@ RUN mkdir /app/log
 COPY --from=frontend-build /app/src/nrc/static/css /app/src/nrc/static/css
 COPY ./src /app/src
 ARG COMMIT_HASH
+ARG RELEASE
 ENV GIT_SHA=${COMMIT_HASH}
+ENV RELEASE=${RELEASE}
 
 ENV DJANGO_SETTINGS_MODULE=nrc.conf.docker
 
@@ -60,5 +62,10 @@ 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-notificaties" \
+      org.label-schema.version=$RELEASE \
+      org.label-schema.name="Open Notificaties"
+
 EXPOSE 8000
 CMD ["/start.sh"]

README.rst

@@ -2,7 +2,7 @@
 Open Notificaties
 =================
 
-:Version: 1.0.0-alpha
+:Version: 1.0.0
 :Source: https://github.com/open-zaak/open-notificaties
 :Keywords: zaken, zaakgericht werken, GEMMA, notificaties
 :PythonVersion: 3.6
@@ -11,8 +11,10 @@ Open Notificaties
 
 API voor het routeren van notificaties.
 
-Ontwikkeld door `Maykin Media B.V.`_ in opdracht van Amsterdam, Rotterdam, Utrecht,
-Tilburg, Arnhem, Haarlem, 's-Hertogenbosch, Delft en Hoorn, onder regie van `Dimpact`_.
+Ontwikkeld door `Maykin Media B.V.`_ in opdracht van Amsterdam, Rotterdam,
+Utrecht, Tilburg, Arnhem, Haarlem, 's-Hertogenbosch, Delft en Hoorn,
+Medemblik, Stede Broec, Drechteland, Enkhuizen (SED), onder regie van
+`Dimpact`_.
 
 Inleiding
 =========

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,8 @@ TAG=${1:-latest}
 # Build the image
 docker build \
     -t $REPO:$TAG \
+    --build-arg COMMIT_HASH=$git_hash \
+    --build-arg RELEASE=$TAG \
     .
 
 # Push the image

docs/introduction/team.rst

@@ -13,7 +13,7 @@ August 1, 2019, by 9 municipalities:
 * Haarlem
 * 's-Hertogenbosch
 * Delft
-* Hoorn
+* Hoorn, Medemblik, Stede Broec, Drechteland, Enkhuizen (SED)
 
 Using `Dimpact`_ as a legal entity, they formed a project to develop a modern,
 open-source data- and services-layer to enable `zaakgericht werken`_, in line with the

src/nrc/conf/dev.py

@@ -8,6 +8,7 @@
     "SECRET_KEY", "rt@lin*q6@wy)xd**5#xz)1p@sqcfj*@w77wn-in2+1zq6*a)m"
 )
 os.environ.setdefault("IS_HTTPS", "no")
+os.environ.setdefault("RELEASE", "dev")
 
 os.environ.setdefault("DB_NAME", "opennotificaties")
 os.environ.setdefault("DB_USER", "opennotificaties")

src/nrc/conf/includes/base.py

@@ -343,6 +343,8 @@
 else:
     GIT_SHA = None
 
+RELEASE = config("RELEASE", GIT_SHA)
+
 ##############################
 #                            #
 # 3RD PARTY LIBRARY SETTINGS #

src/nrc/datamodel/migrations/0013_auto_20200207_1344.py

@@ -0,0 +1,36 @@
+# Generated by Django 2.2.8 on 2020-02-07 13:44
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("datamodel", "0012_auto_20190605_1523"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="kanaal",
+            name="filters",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=100),
+                blank=True,
+                default=list,
+                help_text="Lijst van mogelijke filter kenmerken van een KANAAL. Deze filter kenmerken kunnen worden gebruikt bij het aanmaken van een ABONNEMENT.",
+                size=None,
+                verbose_name="filters",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="kanaal",
+            name="naam",
+            field=models.CharField(
+                help_text='Naam van het KANAAL (ook wel "Exchange" genoemd) dat de bron vertegenwoordigd.',
+                max_length=50,
+                unique=True,
+                verbose_name="Naam",
+            ),
+        ),
+    ]

src/nrc/templates/master.html

@@ -58,6 +58,8 @@ <h5>Overige</h5>
             <code>{{ settings.API_VERSION }}</code>
           </div>
           <div class="col-6 text-muted text-right">
+            <code>{{ settings.RELEASE }}</code>
+            <br>
             <code>{{ settings.GIT_SHA|default:"" }}</code>
           </div>
         </div>

src/nrc/utils/context_processors.py

@@ -10,6 +10,7 @@ def settings(request):
         "SITE_TITLE",
         "API_VERSION",
         "GIT_SHA",
+        "RELEASE",
     )
 
     return {