From eb5aab212c759548322505f5e80da93ba2e8ddd0 Mon Sep 17 00:00:00 2001 From: Heiko Niebuhr Date: Tue, 30 Jun 2020 15:51:49 +0200 Subject: [PATCH 1/4] New eccodes version added Version number for eccodes-python added --- Dockerfile | 6 ++++-- Makefile | 4 ++-- hooks/build | 1 + hooks/env | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4aecd78..3775734 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux \ # Install eccodes # requires ecbuild -ARG ECCODES_VERSION=2.17.1 +ARG ECCODES_VERSION=2.18.0 RUN set -eux \ && mkdir -p /src/ \ && cd /src \ @@ -107,11 +107,13 @@ RUN set -eux \ # Install ecCodes # requires ecBuild # Install Python run-time dependencies (for eccodes) +ARG PYTHON_ECCODES_VERSION=0.9.8 RUN set -ex \ && mkdir -p /src/ \ && cd /src/ \ && git clone https://github.com/ecmwf/eccodes-python \ && cd eccodes-python \ + && git checkout ${PYTHON_ECCODES_VERSION} \ && pip install -e . \ && python builder.py @@ -173,4 +175,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vendor="DWD - Deutscher Wetterdienst" \ org.label-schema.version=$VERSION \ - org.label-schema.schema-version="1.0" \ No newline at end of file + org.label-schema.schema-version="1.0" diff --git a/Makefile b/Makefile index 6e23e32..2885a2a 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ SOURCE_TAG := ${shell . ./hooks/env && echo $$SOURCE_TAG} DOCKER_TAG := ${shell . ./hooks/env && echo $$DOCKER_TAG} IMAGE_NAME := ${shell . ./hooks/env && echo $$IMAGE_NAME} -aall: build +all: build .PHONY: build run run-interactive test login login-user-pass push clean @@ -36,4 +36,4 @@ push: ./hooks/post_push clean: - @docker rmi ${DOCKER_REPO} \ No newline at end of file + @docker rmi ${DOCKER_REPO} diff --git a/hooks/build b/hooks/build index 6f0583f..053080f 100755 --- a/hooks/build +++ b/hooks/build @@ -24,6 +24,7 @@ docker build \ --build-arg ECBUILD_VERSION=${ECBUILD_VERSION} \ --build-arg ECCODES_VERSION=${ECCODES_VERSION} \ + --build-arg PYTHON_ECCODES_VERSION=${PYTHON_ECCODES_VERSION} \ --build-arg PYTHON_VERSION=${PYTHON_VERSION} \ --build-arg BUILD_DATE=${DATE} \ --build-arg VCS_URL=${SOURCE_URL} \ diff --git a/hooks/env b/hooks/env index a0b12a2..00db579 100755 --- a/hooks/env +++ b/hooks/env @@ -6,7 +6,8 @@ [ -n "$SOURCE_URL" ] || SOURCE_URL=https://github.com/deutscherwetterdienst/python-eccodes [ -n "$DOCKER_REPO" ] || DOCKER_REPO=deutscherwetterdienst/python-eccodes [ -n "$ECBUILD_VERSION" ] || ECBUILD_VERSION="3.3.2" -[ -n "$ECCODES_VERSION" ] || ECCODES_VERSION="2.17.1" +[ -n "$ECCODES_VERSION" ] || ECCODES_VERSION="2.18.0" +[ -n "$PYTHON_ECCODES_VERSION" ] || PYTHON_ECCODES_VERSION="0.9.8" [ -n "$PYTHON_VERSION" ] || PYTHON_VERSION="3.7.7" [ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD) @@ -33,4 +34,4 @@ fi [ -n "$IMAGE_NAME_LATEST" ] || IMAGE_NAME_LATEST=${DOCKER_REPO}:latest [ -n "$IMAGE_NAME_LONG" ] || IMAGE_NAME_LONG=${DOCKER_REPO}:${PYTHON_VERSION}-${ECCODES_VERSION}-${DOCKER_TAG} [ -n "$IMAGE_NAME_LONG_LATEST" ] || IMAGE_NAME_LONG_LATEST=${DOCKER_REPO}:${PYTHON_VERSION}-${ECCODES_VERSION}-latest -[ -n "$DATE" ] || DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) \ No newline at end of file +[ -n "$DATE" ] || DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) From 7c6bfa5fc1e6d7210edb913b8b1f832252379450 Mon Sep 17 00:00:00 2001 From: Heiko Niebuhr Date: Tue, 30 Jun 2020 16:08:58 +0200 Subject: [PATCH 2/4] Makefile instructed to use Bash --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 2885a2a..3d1ee6a 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL := /bin/bash + # test TEST_CMD := python -m eccodes selfcheck From 1ee8954c1c8e4b3ec50abdf1678d5626a69aac87 Mon Sep 17 00:00:00 2001 From: Heiko Niebuhr Date: Tue, 30 Jun 2020 16:31:03 +0200 Subject: [PATCH 3/4] Updated versions in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4b49d2a..bc26e97 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Python and [ECMWF ecCodes](https://github.com/ecmwf/eccodes) packaged in a Docke [![Python Version](https://img.shields.io/badge/python-3.7.7-informational)](https://hub.docker.com/_/python) [![ecCodes Version](https://img.shields.io/badge/ecCodes-2.17.1-informational)](https://github.com/ecmwf/eccodes) -[![ecCodes- Version](https://img.shields.io/static/v1?label=eccodes-python&message=latest&color=informational)](https://github.com/ecmwf/eccodes-python) +[![ecCodes-Python Version](https://img.shields.io/static/v1?label=eccodes-python&message=0.9.8&color=informational)](https://github.com/ecmwf/eccodes-python) [![Docker Build Status](https://img.shields.io/docker/cloud/build/deutscherwetterdienst/python-eccodes.svg)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes) [![Docker Pulls](https://img.shields.io/docker/pulls/deutscherwetterdienst/python-eccodes)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes) @@ -39,4 +39,4 @@ edition centre date dataType gridType stepRange ty 1 of 1 messages in some-file.grib2 1 of 1 total messages in 1 files -``` \ No newline at end of file +``` From 3bd38ae771f747e821fcbc301d3bc0580c79d1ad Mon Sep 17 00:00:00 2001 From: Heiko Niebuhr Date: Tue, 30 Jun 2020 16:32:08 +0200 Subject: [PATCH 4/4] Updated versions in README again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bc26e97..4345aed 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Python and [ECMWF ecCodes](https://github.com/ecmwf/eccodes) packaged in a Docker container to allow for easy processing of GRIB2 and BUFR files. [![Python Version](https://img.shields.io/badge/python-3.7.7-informational)](https://hub.docker.com/_/python) -[![ecCodes Version](https://img.shields.io/badge/ecCodes-2.17.1-informational)](https://github.com/ecmwf/eccodes) +[![ecCodes Version](https://img.shields.io/badge/ecCodes-2.18.0-informational)](https://github.com/ecmwf/eccodes) [![ecCodes-Python Version](https://img.shields.io/static/v1?label=eccodes-python&message=0.9.8&color=informational)](https://github.com/ecmwf/eccodes-python) [![Docker Build Status](https://img.shields.io/docker/cloud/build/deutscherwetterdienst/python-eccodes.svg)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes) [![Docker Pulls](https://img.shields.io/docker/pulls/deutscherwetterdienst/python-eccodes)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes)