From 952e5223820d7371603330d7c5d8daa5e5302190 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 11:15:44 +0100 Subject: [PATCH 1/9] initial Dockerfile versions and bumpversion config --- .bumpversion.cfg | 25 +++++++++++++++++++++++++ .gitlab-ci.yml | 5 ++--- cache/Dockerfile | 2 +- client/Dockerfile | 2 +- core/Dockerfile | 2 +- fluentd/Dockerfile | 2 +- ingestor/Dockerfile | 2 +- preprocessor/Dockerfile | 2 +- 8 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 00000000..62416300 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,25 @@ +[bumpversion] +current_version = 1.0.0-rc.0 +commit = True +tag = True +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)\.(?P\d+))? +serialize = + {major}.{minor}.{patch}-{release}.{build} + {major}.{minor}.{patch} +tag_name = release-{new_version} + +[bumpversion:part:release] +optional_value = final +first_value = alpha +values = + alpha + beta + rc + final + +[bumpversion:file:.bumpversion.cfg] +search = current_version = {current_version} + +[bumpversion:glob:**/Dockerfile] +search = version="{current_version}" +replace = version="{new_version}" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de2ece8a..fd043347 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - build -build-master: +build-tags: image: docker:latest stage: build services: @@ -52,7 +52,6 @@ build-master: - docker push "$IMAGE_6":$VERSION_6 - docker push "$IMAGE_6":latest only: - - master - tags build: image: docker:latest @@ -83,4 +82,4 @@ build: - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build except: - - master + - tags diff --git a/cache/Dockerfile b/cache/Dockerfile index 4653a2a7..82eeebfe 100644 --- a/cache/Dockerfile +++ b/cache/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server cache" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root ADD install.sh \ diff --git a/client/Dockerfile b/client/Dockerfile index 9da01c45..dc028801 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -31,6 +31,6 @@ LABEL name="prism view server client" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server client" \ - version="0.0.1-dev" + version="1.0.0-rc.0" COPY html/ /usr/share/nginx/html/ diff --git a/core/Dockerfile b/core/Dockerfile index 4bdce96b..2ce3281f 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server core" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server core" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile index fb2dfae9..d61f9bec 100644 --- a/fluentd/Dockerfile +++ b/fluentd/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server fluentd" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root RUN gem install fluent-plugin-elasticsearch \ diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile index 61afce21..9691c29b 100644 --- a/ingestor/Dockerfile +++ b/ingestor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2020 EOX IT Services GmbH " \ type="prism view server ingestor" \ - version="0.0.1-dev" + version="1.0.0-rc.0" USER root ADD install.sh requirements.txt \ diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile index b7da584f..f85b597a 100644 --- a/preprocessor/Dockerfile +++ b/preprocessor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server preprocessor" \ - version="0.0.1-dev" + version="1.0.0-rc.0" ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 -- GitLab From 25c0f8cbec0e7a4e39dd0b019d2c34eeadbf91d7 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 12:31:04 +0100 Subject: [PATCH 2/9] add versioning of ops docker compose files, adapt bumpversion conf --- .bumpversion.cfg | 6 +++++- docker-compose.dem.ops.yml | 7 +++++++ docker-compose.emg.ops.yml | 7 +++++++ docker-compose.logging.dev.yml | 2 ++ docker-compose.logging.ops.yml | 2 +- docker-compose.vhr18.ops.yml | 7 +++++++ preprocessor/setup.py | 2 +- 7 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 62416300..2b848625 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,7 +6,7 @@ parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)\.(? serialize = {major}.{minor}.{patch}-{release}.{build} {major}.{minor}.{patch} -tag_name = release-{new_version} +tag_name = {new_version} [bumpversion:part:release] optional_value = final @@ -23,3 +23,7 @@ search = current_version = {current_version} [bumpversion:glob:**/Dockerfile] search = version="{current_version}" replace = version="{new_version}" + +[bumpversion:glob:preprocessor/setup.py] +search = version="{current_version}" +replace = version="{new_version}" diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml index 6cccbfbd..275ee605 100644 --- a/docker-compose.dem.ops.yml +++ b/docker-compose.dem.ops.yml @@ -7,6 +7,7 @@ services: tmpfs: size: 536870912 renderer: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -48,6 +49,7 @@ services: networks: - extnet cache: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 configs: - source: mapcache-ops target: /mapcache-template.xml @@ -90,6 +92,7 @@ services: networks: - extnet registrar: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -99,6 +102,7 @@ services: constraints: - node.labels.type == internal client: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -126,6 +130,7 @@ services: networks: - extnet preprocessor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 volumes: - type: bind source: /var/vhr @@ -135,6 +140,8 @@ services: placement: constraints: - node.labels.type == internal + ingestor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 networks: extnet: name: dem-extnet diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml index 7517f1ae..e3f915bb 100644 --- a/docker-compose.emg.ops.yml +++ b/docker-compose.emg.ops.yml @@ -7,6 +7,7 @@ services: tmpfs: size: 536870912 renderer: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -48,6 +49,7 @@ services: networks: - extnet cache: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 configs: - source: mapcache-ops target: /mapcache-template.xml @@ -90,6 +92,7 @@ services: networks: - extnet registrar: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -99,6 +102,7 @@ services: constraints: - node.labels.type == internal client: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -126,6 +130,7 @@ services: networks: - extnet preprocessor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 volumes: - type: bind source: /var/vhr @@ -135,6 +140,8 @@ services: placement: constraints: - node.labels.type == internal + ingestor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 networks: extnet: name: emg-extnet diff --git a/docker-compose.logging.dev.yml b/docker-compose.logging.dev.yml index d749cb97..38af28cf 100644 --- a/docker-compose.logging.dev.yml +++ b/docker-compose.logging.dev.yml @@ -1,5 +1,7 @@ version: "3.6" services: + fluentd: + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:dev elasticsearch: ports: - "9200:9200" diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml index 53434247..d54897a2 100644 --- a/docker-compose.logging.ops.yml +++ b/docker-compose.logging.ops.yml @@ -1,11 +1,11 @@ version: "3.6" services: fluentd: + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:1.0.0-rc.0 deploy: placement: # this is not strictly required, but feels right constraints: [node.role == manager] - elasticsearch: environment: - bootstrap.memory_lock=true diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml index fef2a0d2..fec8db21 100644 --- a/docker-compose.vhr18.ops.yml +++ b/docker-compose.vhr18.ops.yml @@ -7,6 +7,7 @@ services: tmpfs: size: 536870912 renderer: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -48,6 +49,7 @@ services: networks: - extnet cache: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 configs: - source: mapcache-ops target: /mapcache-template.xml @@ -90,6 +92,7 @@ services: networks: - extnet registrar: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -99,6 +102,7 @@ services: constraints: - node.labels.type == internal client: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -126,6 +130,7 @@ services: networks: - extnet preprocessor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 volumes: - type: bind source: /var/vhr @@ -135,6 +140,8 @@ services: placement: constraints: - node.labels.type == internal + ingestor: + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 networks: extnet: name: vhr18-extnet diff --git a/preprocessor/setup.py b/preprocessor/setup.py index 56f894a9..cd6abc1e 100644 --- a/preprocessor/setup.py +++ b/preprocessor/setup.py @@ -6,7 +6,7 @@ long_description = "" setup( name="preprocessor", # Replace with your own username - version="0.0.1", + version="1.0.0-rc.0", author="", author_email="", description="preprocessor for PVS", -- GitLab From 129bb073b91189fde59e1032545ce12bd5192b96 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 13:32:58 +0100 Subject: [PATCH 3/9] update image versioning to contain release-{vrs}, increment version in all ops docker compose files --- .bumpversion.cfg | 7 ++++++- docker-compose.base.ops.yml | 1 + docker-compose.dem.ops.yml | 13 +++++++------ docker-compose.emg.ops.yml | 13 +++++++------ docker-compose.logging.ops.yml | 3 ++- docker-compose.vhr18.ops.yml | 13 +++++++------ 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2b848625..187318cd 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,7 +6,7 @@ parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)\.(? serialize = {major}.{minor}.{patch}-{release}.{build} {major}.{minor}.{patch} -tag_name = {new_version} +tag_name = release-{new_version} [bumpversion:part:release] optional_value = final @@ -27,3 +27,8 @@ replace = version="{new_version}" [bumpversion:glob:preprocessor/setup.py] search = version="{current_version}" replace = version="{new_version}" + +[bumpversion:glob:docker-compose*ops.yml] +search = :release-{current_version} +replace = :release-{new_version} + diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml index 5aac2ba8..a99190f3 100644 --- a/docker-compose.base.ops.yml +++ b/docker-compose.base.ops.yml @@ -1,4 +1,5 @@ version: "3.6" +x-vs-version: :release-1.0.0-rc.0 # bumpversion services: reverse-proxy: image: traefik:2.1 diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml index 275ee605..f75600ad 100644 --- a/docker-compose.dem.ops.yml +++ b/docker-compose.dem.ops.yml @@ -1,4 +1,5 @@ version: "3.6" +x-vs-version: :release-1.0.0-rc.0 # bumpversion services: database: volumes: @@ -7,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -49,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -92,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -102,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -130,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion volumes: - type: bind source: /var/vhr @@ -141,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion networks: extnet: name: dem-extnet diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml index e3f915bb..057f8bf0 100644 --- a/docker-compose.emg.ops.yml +++ b/docker-compose.emg.ops.yml @@ -1,4 +1,5 @@ version: "3.6" +x-vs-version: :release-1.0.0-rc.0 # bumpversion services: database: volumes: @@ -7,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -49,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -92,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -102,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -130,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion volumes: - type: bind source: /var/vhr @@ -141,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion networks: extnet: name: emg-extnet diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml index d54897a2..f40b5326 100644 --- a/docker-compose.logging.ops.yml +++ b/docker-compose.logging.ops.yml @@ -1,7 +1,8 @@ version: "3.6" +x-vs-version: :release-1.0.0-rc.0 # bumpversion services: fluentd: - image: registry.gitlab.eox.at/esa/prism/vs/fluentd:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0-rc.0 # bumpversion deploy: placement: # this is not strictly required, but feels right diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml index fec8db21..ee235e5f 100644 --- a/docker-compose.vhr18.ops.yml +++ b/docker-compose.vhr18.ops.yml @@ -1,4 +1,5 @@ version: "3.6" +x-vs-version: :release-1.0.0-rc.0 # bumpversion services: database: volumes: @@ -7,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -49,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -92,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -102,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -130,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion volumes: - type: bind source: /var/vhr @@ -141,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0 + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion networks: extnet: name: vhr18-extnet -- GitLab From 6433573e0edfe8dd5b3bc2b01fc8154c41e9bef5 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 15:18:11 +0100 Subject: [PATCH 4/9] show current version in ops client config tag --- .bumpversion.cfg | 3 +++ config/dem_index-dev.html | 1 + config/dem_index-ops.html | 1 + config/emg_index-dev.html | 1 + config/emg_index-ops.html | 1 + config/vhr18_index-dev.html | 1 + config/vhr18_index-ops.html | 1 + 7 files changed, 9 insertions(+) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 187318cd..b9c5ee5b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -32,3 +32,6 @@ replace = version="{new_version}" search = :release-{current_version} replace = :release-{new_version} +[bumpversion:glob:config/*ops.html] +search = release-{current_version} +replace = release-{new_version} diff --git a/config/dem_index-dev.html b/config/dem_index-dev.html index 6251a3c1..fa840fcb 100644 --- a/config/dem_index-dev.html +++ b/config/dem_index-dev.html @@ -3,6 +3,7 @@ + PRISM View Server diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html index c8c60831..5077f021 100644 --- a/config/dem_index-ops.html +++ b/config/dem_index-ops.html @@ -3,6 +3,7 @@ + PRISM View Server diff --git a/config/emg_index-dev.html b/config/emg_index-dev.html index 9fdbd8e5..a1f40cc2 100644 --- a/config/emg_index-dev.html +++ b/config/emg_index-dev.html @@ -3,6 +3,7 @@ + PRISM View Server diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html index d53feee5..a4320968 100644 --- a/config/emg_index-ops.html +++ b/config/emg_index-ops.html @@ -3,6 +3,7 @@ + PRISM View Server diff --git a/config/vhr18_index-dev.html b/config/vhr18_index-dev.html index 800b881a..03e39a73 100644 --- a/config/vhr18_index-dev.html +++ b/config/vhr18_index-dev.html @@ -3,6 +3,7 @@ + PRISM View Server diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html index 2fe8a273..43081909 100644 --- a/config/vhr18_index-ops.html +++ b/config/vhr18_index-ops.html @@ -3,6 +3,7 @@ + PRISM View Server -- GitLab From 058fb7c8abfeed9875315004aeb2badcf39f2b98 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 15:58:20 +0100 Subject: [PATCH 5/9] update gitlab ci --- .gitlab-ci.yml | 92 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd043347..0b8a9197 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: stages: - build - build-tags: image: docker:latest stage: build @@ -13,46 +12,76 @@ build-tags: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - VERSION_1=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2` - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core" - docker pull "$IMAGE_1":latest || true - - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$VERSION_1 core/ - - VERSION_2=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2` + - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$CI_COMMIT_TAG core/ - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor" - docker pull "$IMAGE_2":latest || true - - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$VERSION_2 preprocessor/ - - VERSION_3=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2` + - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$CI_COMMIT_TAG preprocessor/ - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client" - docker pull "$IMAGE_3":latest || true - - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$VERSION_3 client/ - - VERSION_4=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2` + - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$CI_COMMIT_TAG client/ - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache" - docker pull "$IMAGE_4":latest || true - - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$VERSION_4 cache/ - - VERSION_5=`grep 'version="*"' fluentd/Dockerfile | cut -d '"' -f2` + - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$CI_COMMIT_TAG cache/ - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" - docker pull "$IMAGE_5":latest || true - - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$VERSION_5 fluentd/ - - VERSION_6=`grep 'version="*"' ingestor/Dockerfile | cut -d '"' -f2` + - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$CI_COMMIT_TAG fluentd/ - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" - docker pull "$IMAGE_6":latest || true - - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$VERSION_6 ingestor/ + - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build - - docker push "$IMAGE_1":$VERSION_1 + - docker push "$IMAGE_1":$CI_COMMIT_TAG - docker push "$IMAGE_1":latest - - docker push "$IMAGE_2":$VERSION_2 + - docker push "$IMAGE_2":$CI_COMMIT_TAG - docker push "$IMAGE_2":latest - - docker push "$IMAGE_3":$VERSION_3 + - docker push "$IMAGE_3":$CI_COMMIT_TAG - docker push "$IMAGE_3":latest - - docker push "$IMAGE_4":$VERSION_4 + - docker push "$IMAGE_4":$CI_COMMIT_TAG - docker push "$IMAGE_4":latest - - docker push "$IMAGE_5":$VERSION_5 + - docker push "$IMAGE_5":$CI_COMMIT_TAG - docker push "$IMAGE_5":latest - - docker push "$IMAGE_6":$VERSION_6 + - docker push "$IMAGE_6":$CI_COMMIT_TAG - docker push "$IMAGE_6":latest only: - tags +build-staging: + image: docker:latest + stage: build + services: + - docker:dind + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + script: + - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core" + - docker pull "$IMAGE_1":staging || true + - docker build --cache-from "$IMAGE_1":staging -t "$IMAGE_1":dev -t "$IMAGE_1":staging core/ + - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor" + - docker pull "$IMAGE_2":staging || true + - docker build --cache-from "$IMAGE_2":staging -t "$IMAGE_2":dev -t "$IMAGE_2":staging preprocessor/ + - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client" + - docker pull "$IMAGE_3":staging || true + - docker build --cache-from "$IMAGE_3":staging -t "$IMAGE_3":dev -t "$IMAGE_3":staging client/ + - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache" + - docker pull "$IMAGE_4":staging || true + - docker build --cache-from "$IMAGE_4":staging -t "$IMAGE_4":dev -t "$IMAGE_4":staging cache/ + - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" + - docker pull "$IMAGE_5":staging || true + - docker build --cache-from "$IMAGE_5":staging -t "$IMAGE_5":dev -t "$IMAGE_5":staging fluentd/ + - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" + - docker pull "$IMAGE_6":staging || true + - docker build --cache-from "$IMAGE_6":staging -t "$IMAGE_6":dev -t "$IMAGE_6":staging ingestor/ + - cd ./testing && ./gitlab_test.sh + - if [ $? -ne 0 ]; then exit 1; fi # actually fail build + - docker push "$IMAGE_1":staging + - docker push "$IMAGE_2":staging + - docker push "$IMAGE_3":staging + - docker push "$IMAGE_4":staging + - docker push "$IMAGE_5":staging + - docker push "$IMAGE_6":staging + only: + - staging build: image: docker:latest stage: build @@ -62,24 +91,25 @@ build: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - IMAGE="$CI_REGISTRY_IMAGE/pvs_core" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev core/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev core/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev preprocessor/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev preprocessor/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_client" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev client/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev client/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev cache/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev cache/ - IMAGE="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev fluentd/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev fluentd/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_ingestor" - - docker pull "$IMAGE":latest || true - - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev ingestor/ + - docker pull "$IMAGE":staging || true + - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build except: - tags + - staging -- GitLab From a5a222a097af86f48ea177bedc56b6b5cc56b76e Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Fri, 6 Nov 2020 17:27:27 +0100 Subject: [PATCH 6/9] update readme and gitlab ci --- .gitlab-ci.yml | 51 +++++++++++++++++++------------------------------- README.md | 14 +++++++++++++- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b8a9197..596bb59c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: stages: - build -build-tags: +build-tag: image: docker:latest stage: build services: @@ -33,20 +33,14 @@ build-tags: - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build - docker push "$IMAGE_1":$CI_COMMIT_TAG - - docker push "$IMAGE_1":latest - docker push "$IMAGE_2":$CI_COMMIT_TAG - - docker push "$IMAGE_2":latest - docker push "$IMAGE_3":$CI_COMMIT_TAG - - docker push "$IMAGE_3":latest - docker push "$IMAGE_4":$CI_COMMIT_TAG - - docker push "$IMAGE_4":latest - docker push "$IMAGE_5":$CI_COMMIT_TAG - - docker push "$IMAGE_5":latest - docker push "$IMAGE_6":$CI_COMMIT_TAG - - docker push "$IMAGE_6":latest only: - tags -build-staging: +build-master-staging: image: docker:latest stage: build services: @@ -54,34 +48,32 @@ build-staging: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: + - if [[ "$CI_COMMIT_BRANCH" = "master" ]] ; then TAG_USED="latest"; else TAG_USED="staging"; fi - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core" - - docker pull "$IMAGE_1":staging || true - - docker build --cache-from "$IMAGE_1":staging -t "$IMAGE_1":dev -t "$IMAGE_1":staging core/ + - docker build --cache-from "$IMAGE_1":"$TAG_USED" -t "$IMAGE_1":dev -t "$IMAGE_1":"$TAG_USED" core/ - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor" - - docker pull "$IMAGE_2":staging || true - - docker build --cache-from "$IMAGE_2":staging -t "$IMAGE_2":dev -t "$IMAGE_2":staging preprocessor/ + - docker build --cache-from "$IMAGE_2":"$TAG_USED" -t "$IMAGE_2":dev -t "$IMAGE_2":"$TAG_USED" preprocessor/ - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client" - - docker pull "$IMAGE_3":staging || true - - docker build --cache-from "$IMAGE_3":staging -t "$IMAGE_3":dev -t "$IMAGE_3":staging client/ + - docker build --cache-from "$IMAGE_3":"$TAG_USED" -t "$IMAGE_3":dev -t "$IMAGE_3":"$TAG_USED" client/ - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache" - - docker pull "$IMAGE_4":staging || true - - docker build --cache-from "$IMAGE_4":staging -t "$IMAGE_4":dev -t "$IMAGE_4":staging cache/ + - docker build --cache-from "$IMAGE_4":"$TAG_USED" -t "$IMAGE_4":dev -t "$IMAGE_4":"$TAG_USED" cache/ - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE_5":staging || true - - docker build --cache-from "$IMAGE_5":staging -t "$IMAGE_5":dev -t "$IMAGE_5":staging fluentd/ + - docker build --cache-from "$IMAGE_5":"$TAG_USED" -t "$IMAGE_5":dev -t "$IMAGE_5":"$TAG_USED" fluentd/ - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" - - docker pull "$IMAGE_6":staging || true - - docker build --cache-from "$IMAGE_6":staging -t "$IMAGE_6":dev -t "$IMAGE_6":staging ingestor/ + - docker build --cache-from "$IMAGE_6":"$TAG_USED" -t "$IMAGE_6":dev -t "$IMAGE_6":"$TAG_USED" ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build - - docker push "$IMAGE_1":staging - - docker push "$IMAGE_2":staging - - docker push "$IMAGE_3":staging - - docker push "$IMAGE_4":staging - - docker push "$IMAGE_5":staging - - docker push "$IMAGE_6":staging + - docker push "$IMAGE_1":"$TAG_USED" + - docker push "$IMAGE_2":"$TAG_USED" + - docker push "$IMAGE_3":"$TAG_USED" + - docker push "$IMAGE_4":"$TAG_USED" + - docker push "$IMAGE_5":"$TAG_USED" + - docker push "$IMAGE_6":"$TAG_USED" only: - staging + - master + except: + - tags build: image: docker:latest stage: build @@ -91,25 +83,20 @@ build: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - IMAGE="$CI_REGISTRY_IMAGE/pvs_core" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev core/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev preprocessor/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_client" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev client/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev cache/ - IMAGE="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev fluentd/ - IMAGE="$CI_REGISTRY_IMAGE/pvs_ingestor" - - docker pull "$IMAGE":staging || true - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build except: - tags - staging + - master diff --git a/README.md b/README.md index fff3c496..768ded19 100644 --- a/README.md +++ b/README.md @@ -294,7 +294,6 @@ You will log in into`/home/eox/data` directory which contains the 2 logging dir **NOTE:** The mounted directory that you are directed into is *`/home/user`*, where `user` is the username, hence when setting / editing the username in configs, the `sftp` mounted volumes path in `docker-compose..yml` must change respectively. - # Documentation ## Installation @@ -323,6 +322,19 @@ The documentation is generated in the respective *_build/html* directory. # Create software releases +## Release a new vs version + +We use [bump2version](https://github.com/c4urself/bump2version) to increment versions of invividual docker images and create git tags. Tags after push trigger CI `docker push` action of versioned images. It also updates used image versions in `.ops` docker compose files. +Pushing to `master` branch updates `latest` images, while `staging` branch push updates `staging` images. +For **Versions* in general, we use semantic versioning with format {major}.{minor}.{patch}-{release}.{build}. +First check deployed staging version on staging platform (TBD), then if no problems are found, proceed. +Following operation should be done on `staging` branch. +``` +bump2version +git push +git push --tags +``` +Then `staging` branch should be merged to `master`, unless only a patch to previous versions is made. ## Source code release Create a TAR from source code: -- GitLab From 4d4a9d88d70a660adde5a155fb86fc2cc816fa65 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Mon, 9 Nov 2020 14:41:30 +0100 Subject: [PATCH 7/9] update readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 768ded19..5eac5836 100644 --- a/README.md +++ b/README.md @@ -325,16 +325,18 @@ The documentation is generated in the respective *_build/html* directory. ## Release a new vs version We use [bump2version](https://github.com/c4urself/bump2version) to increment versions of invividual docker images and create git tags. Tags after push trigger CI `docker push` action of versioned images. It also updates used image versions in `.ops` docker compose files. + Pushing to `master` branch updates `latest` images, while `staging` branch push updates `staging` images. -For **Versions* in general, we use semantic versioning with format {major}.{minor}.{patch}-{release}.{build}. +For **versions** in general, we use semantic versioning with format {major}.{minor}.{patch}-{release}.{build}. First check deployed staging version on staging platform (TBD), then if no problems are found, proceed. -Following operation should be done on `staging` branch. +Following operation should be done on `staging` or `master` branch. ``` bump2version git push git push --tags ``` -Then `staging` branch should be merged to `master`, unless only a patch to previous versions is made. +If it was done on `staging` branch, then it should be merged to `master`, unless only a patch to previous major versions is made. +A hotfix to production is developed in a branch initiated from master, then merged to staging for verification. It is then merged to master for release. ## Source code release Create a TAR from source code: -- GitLab From 664d474d093b213965da846335aa64d177fef8a2 Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Mon, 9 Nov 2020 14:46:13 +0100 Subject: [PATCH 8/9] do not pull when we build from specified cache in ci --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 596bb59c..0a8cf8e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,22 +13,16 @@ build-tag: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core" - - docker pull "$IMAGE_1":latest || true - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$CI_COMMIT_TAG core/ - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor" - - docker pull "$IMAGE_2":latest || true - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$CI_COMMIT_TAG preprocessor/ - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client" - - docker pull "$IMAGE_3":latest || true - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$CI_COMMIT_TAG client/ - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache" - - docker pull "$IMAGE_4":latest || true - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$CI_COMMIT_TAG cache/ - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE_5":latest || true - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$CI_COMMIT_TAG fluentd/ - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" - - docker pull "$IMAGE_6":latest || true - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build -- GitLab From e0dfc6eeda2a850a15fa4ee423355f770733b76e Mon Sep 17 00:00:00 2001 From: Lubomir Bucek Date: Mon, 9 Nov 2020 14:51:55 +0100 Subject: [PATCH 9/9] manually update version to release-1.0.0-rc.2 to start the versioning --- .bumpversion.cfg | 2 +- cache/Dockerfile | 2 +- client/Dockerfile | 2 +- config/dem_index-dev.html | 2 +- config/dem_index-ops.html | 2 +- config/emg_index-dev.html | 2 +- config/emg_index-ops.html | 2 +- config/vhr18_index-dev.html | 2 +- config/vhr18_index-ops.html | 2 +- core/Dockerfile | 2 +- docker-compose.base.ops.yml | 2 +- docker-compose.dem.ops.yml | 14 +++++++------- docker-compose.emg.ops.yml | 14 +++++++------- docker-compose.logging.ops.yml | 4 ++-- docker-compose.vhr18.ops.yml | 14 +++++++------- fluentd/Dockerfile | 2 +- ingestor/Dockerfile | 2 +- preprocessor/Dockerfile | 2 +- preprocessor/setup.py | 2 +- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b9c5ee5b..9485b618 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0-rc.0 +current_version = 1.0.0-rc.2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)\.(?P\d+))? diff --git a/cache/Dockerfile b/cache/Dockerfile index 82eeebfe..57abc976 100644 --- a/cache/Dockerfile +++ b/cache/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server cache" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" USER root ADD install.sh \ diff --git a/client/Dockerfile b/client/Dockerfile index dc028801..2255e745 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -31,6 +31,6 @@ LABEL name="prism view server client" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server client" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" COPY html/ /usr/share/nginx/html/ diff --git a/config/dem_index-dev.html b/config/dem_index-dev.html index fa840fcb..c4f904b8 100644 --- a/config/dem_index-dev.html +++ b/config/dem_index-dev.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html index 5077f021..77b34692 100644 --- a/config/dem_index-ops.html +++ b/config/dem_index-ops.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/config/emg_index-dev.html b/config/emg_index-dev.html index a1f40cc2..09e3e675 100644 --- a/config/emg_index-dev.html +++ b/config/emg_index-dev.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html index a4320968..171adcd8 100644 --- a/config/emg_index-ops.html +++ b/config/emg_index-ops.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/config/vhr18_index-dev.html b/config/vhr18_index-dev.html index 03e39a73..d517d334 100644 --- a/config/vhr18_index-dev.html +++ b/config/vhr18_index-dev.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html index 43081909..7000f3f1 100644 --- a/config/vhr18_index-ops.html +++ b/config/vhr18_index-ops.html @@ -3,7 +3,7 @@ - + PRISM View Server diff --git a/core/Dockerfile b/core/Dockerfile index 2ce3281f..b8c8148d 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -31,7 +31,7 @@ LABEL name="prism view server core" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server core" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" USER root diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml index a99190f3..2d6ade93 100644 --- a/docker-compose.base.ops.yml +++ b/docker-compose.base.ops.yml @@ -1,5 +1,5 @@ version: "3.6" -x-vs-version: :release-1.0.0-rc.0 # bumpversion +x-vs-version: :release-1.0.0-rc.2 # bumpversion services: reverse-proxy: image: traefik:2.1 diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml index f75600ad..012016bd 100644 --- a/docker-compose.dem.ops.yml +++ b/docker-compose.dem.ops.yml @@ -1,5 +1,5 @@ version: "3.6" -x-vs-version: :release-1.0.0-rc.0 # bumpversion +x-vs-version: :release-1.0.0-rc.2 # bumpversion services: database: volumes: @@ -8,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -50,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -93,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -103,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -131,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion volumes: - type: bind source: /var/vhr @@ -142,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion networks: extnet: name: dem-extnet diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml index 057f8bf0..94ec7a18 100644 --- a/docker-compose.emg.ops.yml +++ b/docker-compose.emg.ops.yml @@ -1,5 +1,5 @@ version: "3.6" -x-vs-version: :release-1.0.0-rc.0 # bumpversion +x-vs-version: :release-1.0.0-rc.2 # bumpversion services: database: volumes: @@ -8,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -50,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -93,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -103,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -131,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion volumes: - type: bind source: /var/vhr @@ -142,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion networks: extnet: name: emg-extnet diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml index f40b5326..2a6437f7 100644 --- a/docker-compose.logging.ops.yml +++ b/docker-compose.logging.ops.yml @@ -1,8 +1,8 @@ version: "3.6" -x-vs-version: :release-1.0.0-rc.0 # bumpversion +x-vs-version: :release-1.0.0-rc.2 # bumpversion services: fluentd: - image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0-rc.2 # bumpversion deploy: placement: # this is not strictly required, but feels right diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml index ee235e5f..024ac46c 100644 --- a/docker-compose.vhr18.ops.yml +++ b/docker-compose.vhr18.ops.yml @@ -1,5 +1,5 @@ version: "3.6" -x-vs-version: :release-1.0.0-rc.0 # bumpversion +x-vs-version: :release-1.0.0-rc.2 # bumpversion services: database: volumes: @@ -8,7 +8,7 @@ services: tmpfs: size: 536870912 renderer: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -50,7 +50,7 @@ services: networks: - extnet cache: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion configs: - source: mapcache-ops target: /mapcache-template.xml @@ -93,7 +93,7 @@ services: networks: - extnet registrar: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -103,7 +103,7 @@ services: constraints: - node.labels.type == internal client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -131,7 +131,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion volumes: - type: bind source: /var/vhr @@ -142,7 +142,7 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion networks: extnet: name: vhr18-extnet diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile index d61f9bec..0bc13cb9 100644 --- a/fluentd/Dockerfile +++ b/fluentd/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server fluentd" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" USER root RUN gem install fluent-plugin-elasticsearch \ diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile index 9691c29b..e1b80dcf 100644 --- a/ingestor/Dockerfile +++ b/ingestor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2020 EOX IT Services GmbH " \ type="prism view server ingestor" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" USER root ADD install.sh requirements.txt \ diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile index f85b597a..987d52b4 100644 --- a/preprocessor/Dockerfile +++ b/preprocessor/Dockerfile @@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \ vendor="EOX IT Services GmbH " \ license="MIT Copyright (C) 2019 EOX IT Services GmbH " \ type="prism view server preprocessor" \ - version="1.0.0-rc.0" + version="1.0.0-rc.2" ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/preprocessor/setup.py b/preprocessor/setup.py index cd6abc1e..34c7a2e8 100644 --- a/preprocessor/setup.py +++ b/preprocessor/setup.py @@ -6,7 +6,7 @@ long_description = "" setup( name="preprocessor", # Replace with your own username - version="1.0.0-rc.0", + version="1.0.0-rc.2", author="", author_email="", description="preprocessor for PVS", -- GitLab