diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 992e0562..9d04002a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.4.1 +current_version = 1.5.0 commit = False tag = False diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e97cac2..5c1e28c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,4 @@ on: - schedule: - - cron: '30 2 * * 1' pull_request: workflow_dispatch: # Allow manual triggering diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1236de7..4ec464dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,16 +1,13 @@ name: Create tag for release on: - pull_request: + workflow_dispatch: # Allow manual triggering + push: branches: - main - types: - - closed - workflow_dispatch: # Allow manual triggering jobs: tag_release: - if: github.event.pull_request.merged == true runs-on: ubuntu-latest permissions: contents: write diff --git a/README.rst b/README.rst index 183efbee..d88c475f 100644 --- a/README.rst +++ b/README.rst @@ -48,19 +48,27 @@ Directories that are submodules - takserver https://github.com/pvarki/docker-atak-server - takintegration https://github.com/pvarki/python-tak-rmapi +Autogenerated (mostly API) docs +------------------------------- + + - Module API docs: https://pvarki.github.io/docker-rasenmaeher-integration/docs/ + - Swagger definition for RASENMAEHER API: https://pvarki.github.io/docker-rasenmaeher-integration/ + Running in local development mode -_________________________________ +--------------------------------- TLDR:: alias rmdev="docker compose -p rmdev -f docker-compose-local.yml -f docker-compose-dev.yml" + rmdev build takinit rmdev build rmdev up or:: alias rmlocal="docker compose -p rmlocal -f docker-compose-local.yml" + rmlocal build takinit rmlocal build rmlocal up @@ -79,7 +87,7 @@ If rasenmaeher-ui devel server complains make sure to delete ui/node_modules -di the dockder node distribution probably is not compatible with whatever you have installed on the host. Gaining first admin access in dev and production mode ----------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In dev mode:: diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index b4adbd0c..375c8d47 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,6 +1,5 @@ # This extends the _local file, run with: # `docker-compose -p rmdev -f docker-compose-local.yml -f docker-compose-dev.yml up -d` -version: '3.7' x-nginxbuilds: &nginxbuildinfo image: pvarki/nginx:1.25${DOCKER_TAG_EXTRA:-} diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 55f2fa5b..5e44212d 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -1,4 +1,5 @@ -version: '3.4' +# For local testing +# `docker-compose -p rmloc -f docker-compose-local.yml up -d` x-kc_dbconfig_env: &kcdbconfig_env KEYCLOAK_DATABASE_NAME: &kcdbname keycloak @@ -57,12 +58,12 @@ x-domains_env: OCSCP_RESPONDER: &publicocsp "https://${SERVER_DOMAIN:-localmaeher.pvarki.fi}:${NGINX_HTTPS_PORT:-4439}/ca/ocsp" # The public URL x-takbuilds: &takbuildinfo - image: &takimage "pvarki/takserver:${TAK_RELEASE:-5.1-RELEASE-11}${DOCKER_TAG_EXTRA:-}" + image: &takimage "pvarki/takserver:${TAK_RELEASE:-5.2-RELEASE-30}${DOCKER_TAG_EXTRA:-}" build: context: ./takserver dockerfile: Dockerfile args: - TAK_RELEASE: ${TAK_RELEASE:-5.1-RELEASE-11} + TAK_RELEASE: ${TAK_RELEASE:-5.2-RELEASE-30} x-nginxbuilds: &nginxbuildinfo image: pvarki/nginx:1.25${DOCKER_TAG_EXTRA:-} @@ -213,6 +214,7 @@ services: postgres: + platform: linux/amd64 # It seems there are no arm images available image: postgis/postgis:15-3.4 networks: - dbnet @@ -692,7 +694,7 @@ services: restart: unless-stopped takrmapi: - image: pvarki/takrmapi:${PVARKI_VERSION_TAG:-latest}${DOCKER_TAG_EXTRA:-}-tak${TAK_RELEASE:-5.1-RELEASE-11} + image: pvarki/takrmapi:${PVARKI_VERSION_TAG:-latest}${DOCKER_TAG_EXTRA:-}-tak${TAK_RELEASE:-5.2-RELEASE-30} build: context: ./takintegration dockerfile: Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index b908158b..368b9c82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.4' # Use bump2version to bump the RELEASE_TAG default value x-kc_dbconfig_env: &kcdbconfig_env @@ -57,15 +56,15 @@ x-domains_env: OCSCP_RESPONDER: &publicocsp "https://${SERVER_DOMAIN:?domain must be defined}:${NGINX_HTTPS_PORT:-443}/ca/ocsp" # The public URL x-takbuilds: &takbuildinfo - image: &takimage "pvarki/takserver:${TAK_RELEASE:-5.1-RELEASE-11}-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-}" + image: &takimage "pvarki/takserver:${TAK_RELEASE:-5.2-RELEASE-30}-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-}" build: context: ./takserver dockerfile: Dockerfile args: - TAK_RELEASE: ${TAK_RELEASE:-5.1-RELEASE-11} + TAK_RELEASE: ${TAK_RELEASE:-5.2-RELEASE-30} x-nginxbuilds: &nginxbuildinfo - image: pvarki/nginx:1.25-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/nginx:1.25-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./nginx dockerfile: Dockerfile @@ -104,7 +103,7 @@ x-takserver_env: &takserver_env services: miniwerk: - image: pvarki/miniwerk:1.1.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/miniwerk:1.1.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./miniwerk dockerfile: Dockerfile @@ -130,7 +129,7 @@ services: - "80:80" cfssl: - image: pvarki/cfssl:api-1.2.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/cfssl:api-1.2.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./cfssl dockerfile: Dockerfile @@ -153,7 +152,7 @@ services: restart: unless-stopped ocsp: - image: pvarki/cfssl:ocsp-1.2.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/cfssl:ocsp-1.2.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./cfssl dockerfile: Dockerfile @@ -179,7 +178,7 @@ services: restart: unless-stopped ocsprest: - image: pvarki/cfssl:ocsprest-1.0.4-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/cfssl:ocsprest-1.0.4-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./cfssl dockerfile: Dockerfile @@ -239,7 +238,7 @@ services: condition: service_completed_successfully openldap: - image: pvarki/openldap:1.0.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/openldap:1.0.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./openldap dockerfile: Dockerfile @@ -326,7 +325,7 @@ services: condition: service_healthy rmapi: - image: pvarki/rmapi:1.4.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/rmapi:1.4.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./api dockerfile: Dockerfile @@ -377,7 +376,7 @@ services: restart: unless-stopped rmui: - image: pvarki/rmui:1.3.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/rmui:1.3.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./ui dockerfile: Dockerfile @@ -386,7 +385,7 @@ services: - rmui_files:/deliver nginx_templates: - image: pvarki/nginx:templates-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/nginx:templates-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./nginx dockerfile: Dockerfile @@ -445,7 +444,7 @@ services: restart: unless-stopped kwinit: # Mostly to make sure it's built - image: pvarki/kw_product_init:1.0.0-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/kw_product_init:1.0.0-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./kw_product_init dockerfile: Dockerfile @@ -603,7 +602,7 @@ services: restart: unless-stopped takrmapi: - image: pvarki/takrmapi:1.3.0-tak${TAK_RELEASE:-5.1-RELEASE-11}-d${RELEASE_TAG:-1.4.1}${DOCKER_TAG_EXTRA:-} + image: pvarki/takrmapi:1.3.0-tak${TAK_RELEASE:-5.2-RELEASE-30}-d${RELEASE_TAG:-1.5.0}${DOCKER_TAG_EXTRA:-} build: context: ./takintegration dockerfile: Dockerfile diff --git a/takserver b/takserver index 218d57b2..1e2672ae 160000 --- a/takserver +++ b/takserver @@ -1 +1 @@ -Subproject commit 218d57b21aef57084a43c1c14848737d07552ac7 +Subproject commit 1e2672ae4064898baea1ae16bfcc1f1828433547 diff --git a/version.yml b/version.yml index b671531f..804ca711 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: "1.4.1" # use bump2version to bump this +version: "1.5.0" # use bump2version to bump this