Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use separate repo for api docs #278

Merged
merged 5 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions docker/actinia-core-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mundialis/grass-py3-pdal:stable-alpine as grass
FROM mundialis/esa-snap:s1tbx-8.0.3 as snap
FROM mundialis/actinia-core:alpine-build-pkgs_v8 as build
FROM mundialis/actinia-core:alpine-build-pkgs_v9 as build

# based on GRASS GIS releasebranch_7_8 (grass78)
# for latest GRASS GIS (79), change first line to
Expand Down Expand Up @@ -59,22 +59,31 @@ RUN while IFS=, read -r ADDON SERVER; do unset URL; test -z $SERVER || URL="url=
# Currently, ADD always breaks cache, as "download_count" increases every time
# ADD https://api.github.com/repos/mundialis/actinia_statistic_plugin/releases/latest /scratch/actinia_statistic_plugin_latest_release.json
WORKDIR /build
# Get statistics plugin (26188052 = 0.0.3)
RUN curl https://api.github.com/repos/mundialis/actinia_statistic_plugin/releases/43983719 > resp.json && \
# Get statistics plugin (53929318 = 0.0.4)
RUN curl https://api.github.com/repos/mundialis/actinia_statistic_plugin/releases/53929318 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get satellite plugin (26187974 = 0.0.3)
RUN curl https://api.github.com/repos/mundialis/actinia_satellite_plugin/releases/43983668 > resp.json && \
# Get satellite plugin (53929219 = 0.0.4)
RUN curl https://api.github.com/repos/mundialis/actinia_satellite_plugin/releases/53929219 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get actinia-metadata-plugin (38726425 = 1.0.0)
RUN curl https://api.github.com/repos/mundialis/actinia-metadata-plugin/releases/38726425 > resp.json && \
# Get actinia-metadata-plugin (53929141 = 1.0.2)
RUN curl https://api.github.com/repos/mundialis/actinia-metadata-plugin/releases/53929141 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get actinia-module-plugin (45775508 = 2.2.0)
RUN curl https://api.github.com/repos/mundialis/actinia-module-plugin/releases/45775508 > resp.json && \
# Get actinia-module-plugin (53928473 = 2.2.1)
RUN curl https://api.github.com/repos/mundialis/actinia-module-plugin/releases/53928473 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get actinia-stac-plugin (54012264 = 0.0.1)
RUN curl https://api.github.com/repos/mundialis/actinia-stac-plugin/releases/54012264 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get actinia-api (54010688 = 2.0.0)
RUN curl https://api.github.com/repos/mundialis/actinia-api/releases/54010688 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json

# Install actinia-core and plugins
COPY --from=build /build/*.whl /build/
# the problem with getting broken 20.0.1 seems to be overcome, the outcommenting
Expand Down
8 changes: 4 additions & 4 deletions docker/actinia-core-alpine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ $ docker build \
--no-cache \
--file docker/actinia-core-alpine/Dockerfile_build_pkgs \
--tag actinia-core:alpine-build-pkgs .
$ docker tag actinia-core:alpine-build-pkgs mundialis/actinia-core:alpine-build-pkgs_v8
$ docker push mundialis/actinia-core:alpine-build-pkgs_v8
$ docker tag actinia-core:alpine-build-pkgs mundialis/actinia-core:alpine-build-pkgs_v9
$ docker push mundialis/actinia-core:alpine-build-pkgs_v9

$ docker build \
--pull \
--no-cache \
--file docker/actinia-core-alpine/Dockerfile_runtime_pkgs \
--tag actinia-core:alpine-runtime-pkgs .
$ docker tag actinia-core:alpine-runtime-pkgs mundialis/actinia-core:alpine-runtime-pkgs_v8
$ docker push mundialis/actinia-core:alpine-runtime-pkgs_v8
$ docker tag actinia-core:alpine-runtime-pkgs mundialis/actinia-core:alpine-runtime-pkgs_v9
$ docker push mundialis/actinia-core:alpine-runtime-pkgs_v9

$ docker build \
--pull \
Expand Down
4 changes: 3 additions & 1 deletion docker/actinia-core-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mundialis/actinia-core:0.99.26 as actinia_test
FROM mundialis/actinia-core:2.0.0 as actinia_test

LABEL authors="Carmen Tawalika,Anika Weinmann"
LABEL maintainer="tawalika@mundialis.de,weinmann@mundialis.de"
Expand Down Expand Up @@ -27,6 +27,8 @@ RUN wget --quiet https://grass.osgeo.org/sampledata/north_carolina/nc_spm_mapset
mv modis_lst /actinia_core/grassdb/nc_spm_08/modis_lst
RUN chown -R 1001:1001 /actinia_core/grassdb/nc_spm_08/modis_lst && chmod -R g+w /actinia_core/grassdb/nc_spm_08/modis_lst

RUN pip3 install actinia-api@https://github.com/mundialis/actinia-api/releases/download/2.0.0/actinia_api-2.0.0-py3-none-any.whl

# copy needed files and configs for test
COPY docker/actinia-core-alpine/actinia.cfg /etc/default/actinia
COPY docker/actinia-core-tests/actinia-test.cfg /etc/default/actinia_test
Expand Down
12 changes: 12 additions & 0 deletions src/actinia_core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This mainly concerns the plugins:
* [actinia_statistic_plugin](https://github.com/mundialis/actinia_statistic_plugin) (statistic)
* [actinia_satallite_plugin](https://github.com/mundialis/actinia_satellite_plugin) (satellite)
* [actinia-metadata-plugin](https://github.com/mundialis/actinia-metadata-plugin) uses no sources of actinia_core
* [actinia-stac-plugin](https://github.com/mundialis/actinia-stac-plugin) (stac)
* [actinia-api](https://github.com/mundialis/actinia-api) (api)

The modules inside common folder are not only commonly used by actinia but also by actinia plugins.
Some other modules outside of core folder are concerned as well.
Expand Down Expand Up @@ -38,6 +40,8 @@ Some other modules outside of core folder are concerned as well.
| actinia_core.core.common.response_models | create_response_from_model, ProcessingErrorResponseModel, ProcessingResponseModel, SimpleResponseModel, StringListProcessingResultResponseModel, UnivarResultModel |
| actinia_core.core.common.sentinel_processing_library | Sentinel2Processing |
| actinia_core.core.common.user | ActiniaUser |
| actinia_core.core.redis_user | RedisUserInterface |

------------

### Complete list of where modules are used and what exactly is imported
Expand Down Expand Up @@ -92,3 +96,11 @@ actinia_core.core.common.redis_interface import connect, create_job_queues
actinia_core.core.common.response_models import SimpleResponseModel
actinia_core.core.common.response_models import UnivarResultModel
actinia_core.core.common.sentinel_processing_library import Sentinel2Processing

__stac__
actinia_core.rest.resource_base import ResourceBase
actinia_core.core.common.redis_base import RedisBaseInterface
actinia_core.core.common.config import Configuration

__api__
actinia_core.models.response_models import ProcessingResponseModel
1 change: 1 addition & 0 deletions src/actinia_core/models/openapi/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Moved to https://github.com/mundialis/actinia-api
86 changes: 0 additions & 86 deletions src/actinia_core/models/openapi/api_log_management.py

This file was deleted.

68 changes: 0 additions & 68 deletions src/actinia_core/models/openapi/location_management.py

This file was deleted.

Loading