diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a8cf8e653ff4653aff6558e2cd05dedf388645b..b8b7ced98cd2387cc57bacfc82a5f304fa175627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - build build-tag: - image: docker:latest + image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest stage: build services: - docker:dind @@ -35,7 +35,7 @@ build-tag: only: - tags build-master-staging: - image: docker:latest + image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest stage: build services: - docker:dind @@ -69,7 +69,7 @@ build-master-staging: except: - tags build: - image: docker:latest + image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest stage: build services: - docker:dind diff --git a/testing/Dockerfile b/testing/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..e423222bc456c31610997c52d20bebe97d606751 --- /dev/null +++ b/testing/Dockerfile @@ -0,0 +1,35 @@ +#------------------------------------------------------------------------------ +# +# Project: prism view server +# Authors: Stephan Meissl <stephan.meissl@eox.at> +# +#------------------------------------------------------------------------------ +# Copyright (C) 2020 EOX IT Services GmbH <https://eox.at> +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies of this Software or works derived from this Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +#----------------------------------------------------------------------------- + +# this image is built manually and pushed to registry.gitlab.eox.at/esa/prism/vs/docker-base-testing + +FROM docker:latest + +RUN apk update && apk add bash postgresql-dev gcc g++ python3 python3-dev musl-dev py-pip libffi-dev openssl-dev make gdal==3.1.4-r0 gdal-dev==3.1.4-r0 + +ADD requirements.txt / +RUN pip3 install -r requirements.txt diff --git a/testing/gitlab_test.sh b/testing/gitlab_test.sh index 8ce6b51f86676d54f807a2171f68c39b231b2d3c..8cb3e2c1cdf200948a1cf5989de0fbc1224f5d3a 100755 --- a/testing/gitlab_test.sh +++ b/testing/gitlab_test.sh @@ -38,10 +38,6 @@ printf $sftp_users_emg | docker config create sftp_users_emg - docker stack deploy -c ../docker-compose.emg.yml -c ../docker-compose.emg.dev.yml emg-pvs -# installing the requirments -apk update && apk add bash postgresql-dev gcc g++ python3 python3-dev musl-dev py-pip libffi-dev openssl-dev make gdal==3.1.4-r0 gdal-dev==3.1.4-r0 -pip3 install -r requirements.txt - ./docker-stack-wait.sh -n renderer -n registrar -n preprocessor -n ingestor -n sftp emg-pvs docker service ls