diff --git a/CHANGELOG.md b/CHANGELOG.md index cece2389861f0c990848beefe32dd61f7245334e..65e7da2a58b653655c65c3f7d7a9947b86f74d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,19 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] - -### Added +## [0.9.2] - 2023-02-28 +(Henrik tom Wörden) ### Changed - -### Deprecated - -### Removed - -### Fixed - -### Security +* Update CaosDB components to their most recent releases ## [0.9.1] - 2022-11-08 (Florian Spreckelsen) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 5ab322e39b9368ee575e34ca0240cee8a5e9a2d6..e916ff17388cfa3a4e0c0ae3fb6bef3b8ff9274a 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -12,7 +12,7 @@ services: networks: - caosnet caosdb-server: - image: "caosdb/caosdb:0.9.2-dev" + image: "caosdb/caosdb:0.9.2" depends_on: - sqldb networks: diff --git a/docker/Dockerfile b/docker/Dockerfile index 9041e982e45f8b7bf89af5238b46200e8df995bc..261d0e62d487ad217a0a01bcf95fa2e885c518f5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -67,7 +67,7 @@ RUN git clone "$REM_PYLIB" \ && git checkout "$REF_PYLIB" # Store hash of HEAD commit: -RUN git -C caosdb-pylib rev-parse HEAD >> caosdb_pylib_commit +RUN git -C caosdb-pylib rev-parse HEAD >> caosdb_pylib_commit && cp caosdb_pylib_commit caosdb-pylib/ # Remove git objects RUN rm -r caosdb-pylib/.git @@ -88,6 +88,7 @@ RUN git clone "$REM_ADVANCEDUSERTOOLS" \ # Store hash of HEAD commit: RUN git -C caosdb-advanced-user-tools rev-parse HEAD >> caosdb_advancedusertools_commit + # Remove git objects RUN rm -r caosdb-advanced-user-tools/.git @@ -162,11 +163,11 @@ RUN apt-get update && apt-get install -y \ python3-pandas \ python3-pip \ python3-xlrd \ - python3-yaml + python3-yaml \ + python3-wheel RUN pip3 install \ jsonschema \ - pysocks \ py3-validate-email RUN rm -r /var/cache/apt /var/lib/apt diff --git a/docker/transfer/build_docker/cert.sh b/docker/transfer/build_docker/cert.sh index e3cdaeae8a96925cd21dee945fcc031bd80048ef..bc4e9ea5263fb45c9be635557c0ef03165113b56 100755 --- a/docker/transfer/build_docker/cert.sh +++ b/docker/transfer/build_docker/cert.sh @@ -1,9 +1,10 @@ #!/bin/bash -# ** header v3.0 # This file is a part of the CaosDB Project. # # Copyright (C) 2019 Daniel Hornung, Göttingen +# Copyright (C) 2022 Timm Fitschen <t.fitschen@indiscale.com> +# Copyright (C) 2022 IndiScale GmbH <info@indiscale.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -18,7 +19,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. # -# ** end header # Creates a directory `cert` and certificates in this directory. @@ -35,6 +35,8 @@ # - KEYPW :: Password for the key (default ist CaosDBSecret) # - KEYSTOREPW :: Password for the key store (same as KEYPW) +set -e + function cert() { mkdir -p cert cd cert @@ -48,8 +50,10 @@ function cert() { # Some organization should be given, otherwise Firefox won't even display the certificate. KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \ -out caosdb.cert.pem -passin env:KEYPW \ + -subj "/C=/ST=/L=/O=example/OU=example/CN=${CAOSHOSTNAME}" \ -days 365 \ - -subj "/C=/ST=/L=/O=example/OU=example/CN=${CAOSHOSTNAME}" + -addext "subjectAltName = DNS:${CAOSHOSTNAME}" \ + -addext "certificatePolicies = 1.2.3.4" KEYPW="${KEYPW}" KEYSTOREPW="$KEYSTOREPW" openssl pkcs12 -export \ -inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \ -passin env:KEYPW -passout env:KEYPW