Skip to content

Commit

Permalink
Dockerfile: bump base image to python:3.9-slim-bullseye
Browse files Browse the repository at this point in the history
  • Loading branch information
soxofaan committed Sep 28, 2023
1 parent 4653d63 commit 54e41cd
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 11 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,32 @@ All notable changes to this project will be documented in this file.

The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Current: 0.11.x]

### Added

### Changed

- Dockerfile: switch to `python:3.9-slim-bullseye` base image

### Fixed

### Removed

## [Current: 0.10.x]

## [0.10.x]

### Added

- Added simple UDP support by directly proxying to "first" upstream backend (e.g. VITO)
([#90](https://github.com/Open-EO/openeo-aggregator/issues/90))
- Background task to prime caches ([#74](https://github.com/Open-EO/openeo-aggregator/issues/74))

### Changed

### Fixed

### Removed

- Removed `ENV` based config loading for clarity, `OPENEO_AGGREGATOR_CONFIG` must be full explicit path to config ([#117](https://github.com/Open-EO/openeo-aggregator/issues/117))


## [0.9.x]

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim-buster
FROM python:3.9-slim-bullseye


# Workaround for IPv4/IPv6 networking performance issues.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ variant of this application config:
Use the env var `OPENEO_AGGREGATOR_CONFIG` to point to the desired config path.
By default, `conf/aggregator.dummy.py` is loaded.

For example, when using the Docker image, add something like this

-e OPENEO_AGGREGATOR_CONFIG=/home/openeo/aggregator/conf/aggregator.dev.py

Also note that these concrete config files will be refactored out of the `openeo-aggregator` repo
at some point in the future ([#117](https://github.com/Open-EO/openeo-aggregator/issues/117))
and probably only a dummy default config will be preserved.
Expand Down
10 changes: 9 additions & 1 deletion src/openeo_aggregator/about.py
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
__version__ = "0.10.10a1"
import logging
import sys

__version__ = "0.11.0a1"


def log_version_info():
log = logging.getLogger(__name__)
log.info(f"openeo-aggregator {__version__} (Python {sys.version}")
4 changes: 2 additions & 2 deletions src/openeo_aggregator/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
)
from openeo_driver.utils import smart_bool

import openeo_aggregator.about
from openeo_aggregator.about import log_version_info
from openeo_aggregator.backend import (
AggregatorBackendImplementation,
MultiBackendConnection,
Expand All @@ -37,7 +37,7 @@ def create_app(config: Any = None, auto_logging_setup: bool = True) -> flask.Fla
if auto_logging_setup:
setup_logging(config=get_aggregator_logging_config(context=LOGGING_CONTEXT_FLASK))

_log.info(f"create_app() with {openeo_aggregator.about.__version__=}")
log_version_info()

os.environ.setdefault(ConfigGetter.OPENEO_BACKEND_CONFIG, str(get_config_dir() / "backend_config.py"))

Expand Down
4 changes: 2 additions & 2 deletions src/openeo_aggregator/background/prime_caches.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
setup_logging,
)

import openeo_aggregator.about
from openeo_aggregator.about import log_version_info
from openeo_aggregator.app import get_aggregator_logging_config
from openeo_aggregator.backend import AggregatorBackendImplementation
from openeo_aggregator.config import (
Expand Down Expand Up @@ -111,7 +111,7 @@ def prime_caches(
require_zookeeper_writes: bool = False,
fail_mode: str = FAIL_MODE_FAILFAST,
):
_log.info(f"{openeo_aggregator.about.__version__=}")
log_version_info()
with TimingLogger(title=f"Prime caches", logger=_log):
config: AggregatorConfig = get_config(config)
_log.info(f"Using config: {config.get('config_source')=}")
Expand Down

0 comments on commit 54e41cd

Please sign in to comment.