Skip to content
Snippets Groups Projects
Commit e0cf6f2e authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

REL: new release

parent d5dd709d
Branches
Tags
No related merge requests found
Pipeline #34196 failed
...@@ -6,19 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ...@@ -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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [0.9.2] - 2023-02-28
(Henrik tom Wörden)
### Added
### Changed ### Changed
* Update CaosDB components to their most recent releases
### Deprecated
### Removed
### Fixed
### Security
## [0.9.1] - 2022-11-08 ## [0.9.1] - 2022-11-08
(Florian Spreckelsen) (Florian Spreckelsen)
......
...@@ -12,7 +12,7 @@ services: ...@@ -12,7 +12,7 @@ services:
networks: networks:
- caosnet - caosnet
caosdb-server: caosdb-server:
image: "caosdb/caosdb:0.9.2-dev" image: "caosdb/caosdb:0.9.2"
depends_on: depends_on:
- sqldb - sqldb
networks: networks:
......
...@@ -67,7 +67,7 @@ RUN git clone "$REM_PYLIB" \ ...@@ -67,7 +67,7 @@ RUN git clone "$REM_PYLIB" \
&& git checkout "$REF_PYLIB" && git checkout "$REF_PYLIB"
# Store hash of HEAD commit: # 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 # Remove git objects
RUN rm -r caosdb-pylib/.git RUN rm -r caosdb-pylib/.git
...@@ -88,6 +88,7 @@ RUN git clone "$REM_ADVANCEDUSERTOOLS" \ ...@@ -88,6 +88,7 @@ RUN git clone "$REM_ADVANCEDUSERTOOLS" \
# Store hash of HEAD commit: # Store hash of HEAD commit:
RUN git -C caosdb-advanced-user-tools rev-parse HEAD >> caosdb_advancedusertools_commit RUN git -C caosdb-advanced-user-tools rev-parse HEAD >> caosdb_advancedusertools_commit
# Remove git objects # Remove git objects
RUN rm -r caosdb-advanced-user-tools/.git RUN rm -r caosdb-advanced-user-tools/.git
...@@ -162,11 +163,11 @@ RUN apt-get update && apt-get install -y \ ...@@ -162,11 +163,11 @@ RUN apt-get update && apt-get install -y \
python3-pandas \ python3-pandas \
python3-pip \ python3-pip \
python3-xlrd \ python3-xlrd \
python3-yaml python3-yaml \
python3-wheel
RUN pip3 install \ RUN pip3 install \
jsonschema \ jsonschema \
pysocks \
py3-validate-email py3-validate-email
RUN rm -r /var/cache/apt /var/lib/apt RUN rm -r /var/cache/apt /var/lib/apt
......
#!/bin/bash #!/bin/bash
# ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the CaosDB Project.
# #
# Copyright (C) 2019 Daniel Hornung, Göttingen # 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 # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
# #
# ** end header
# Creates a directory `cert` and certificates in this directory. # Creates a directory `cert` and certificates in this directory.
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
# - KEYPW :: Password for the key (default ist CaosDBSecret) # - KEYPW :: Password for the key (default ist CaosDBSecret)
# - KEYSTOREPW :: Password for the key store (same as KEYPW) # - KEYSTOREPW :: Password for the key store (same as KEYPW)
set -e
function cert() { function cert() {
mkdir -p cert mkdir -p cert
cd cert cd cert
...@@ -48,8 +50,10 @@ function cert() { ...@@ -48,8 +50,10 @@ function cert() {
# Some organization should be given, otherwise Firefox won't even display the certificate. # Some organization should be given, otherwise Firefox won't even display the certificate.
KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \ KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \
-out caosdb.cert.pem -passin env:KEYPW \ -out caosdb.cert.pem -passin env:KEYPW \
-subj "/C=/ST=/L=/O=example/OU=example/CN=${CAOSHOSTNAME}" \
-days 365 \ -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 \ KEYPW="${KEYPW}" KEYSTOREPW="$KEYSTOREPW" openssl pkcs12 -export \
-inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \ -inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \
-passin env:KEYPW -passout env:KEYPW -passin env:KEYPW -passout env:KEYPW
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment