diff options
| -rw-r--r-- | .gitlab-ci.yml | 43 | ||||
| -rw-r--r-- | docker/build.Dockerfile | 7 | ||||
| -rw-r--r-- | docker/conflate.Dockerfile | 10 | ||||
| -rw-r--r-- | docker/prepare.Dockerfile | 7 |
4 files changed, 67 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e564ee7..0c491aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,9 +8,52 @@ cache: &global_cache - data/vicmap.geojson stages: + - docker - prepare - build +docker prepare: + image: docker:latest + services: + - docker:dind + stage: docker + before_script: + - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE":prepare -f "docker/prepare.Dockerfile" . + - docker push "$CI_REGISTRY_IMAGE":prepare + after_script: + - docker logout $CI_REGISTRY + when: manual + +docker build: + image: docker:latest + services: + - docker:dind + stage: docker + before_script: + - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE":build -f "docker/build.Dockerfile" . + - docker push "$CI_REGISTRY_IMAGE":build + after_script: + - docker logout $CI_REGISTRY + when: manual + +docker conflate: + image: docker:latest + services: + - docker:dind + stage: docker + before_script: + - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY + script: + - docker build --pull -t "$CI_REGISTRY_IMAGE":conflate -f "docker/conflate.Dockerfile" . + - docker push "$CI_REGISTRY_IMAGE":conflate + after_script: + - docker logout $CI_REGISTRY + when: manual + prepare: stage: prepare cache: diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile new file mode 100644 index 0000000..69c8fe3 --- /dev/null +++ b/docker/build.Dockerfile @@ -0,0 +1,7 @@ +FROM debian:buster-slim +RUN apt-get -y update && apt-get -y install curl gnupg make +RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get -y update && apt-get -y install nodejs yarn + diff --git a/docker/conflate.Dockerfile b/docker/conflate.Dockerfile new file mode 100644 index 0000000..717f123 --- /dev/null +++ b/docker/conflate.Dockerfile @@ -0,0 +1,10 @@ +FROM debian:buster-slim +RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin osmium-tool software-properties-common +RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get -y update && apt-get -y install nodejs yarn +RUN wget -qO - https://qgis.org/downloads/qgis-2020.gpg.key | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import +RUN chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg +RUN add-apt-repository "deb https://qgis.org/debian $(lsb_release -c -s) main" +RUN apt-get -y update && apt-get -y install qgis diff --git a/docker/prepare.Dockerfile b/docker/prepare.Dockerfile new file mode 100644 index 0000000..d4826cd --- /dev/null +++ b/docker/prepare.Dockerfile @@ -0,0 +1,7 @@ +FROM debian:buster-slim +RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin +RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get -y update && apt-get -y install nodejs yarn + |