diff --git a/.env.default b/.env.default index a45ac4672..657cb960c 100644 --- a/.env.default +++ b/.env.default @@ -37,8 +37,8 @@ MAPSERVER_DATA_PATH=/mnt/data0/mapserver_data MAPSERVER_REPLICAS=1 # Maputnik -MAPUTNIK_IMAGE=localhost:5000/maputnik -MAPUTNIK_TAG=1.5.0 +MAPUTNIK_IMAGE=maputnik/editor +MAPUTNIK_TAG=latest MAPUTNIK_REPLICAS=1 # MongoDB diff --git a/build/maputnik.sh b/build/maputnik.sh deleted file mode 100755 index 84421fb7d..000000000 --- a/build/maputnik.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd maputnik -docker build --pull --force-rm --build-arg VERSION=$MAPUTNIK_TAG -f dockerfile -t localhost:5000/maputnik:$MAPUTNIK_TAG . -docker push localhost:5000/maputnik:$MAPUTNIK_TAG - diff --git a/build/maputnik/dockerfile b/build/maputnik/dockerfile deleted file mode 100644 index 1002a0a4e..000000000 --- a/build/maputnik/dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM nodesource/xenial:6.1.0 - -LABEL maintainer="Kalisio " - -ARG VERSION -ENV BRANCH=v$VERSION - -RUN echo "Building Maputnik $BRANCH" - -EXPOSE 8888 - -ENV HOME /maputnik -RUN mkdir ${HOME} - -RUN git clone --branch ${BRANCH} https://github.com/maputnik/editor.git ${HOME}/ - -WORKDIR ${HOME} - -RUN npm install -d --dev -RUN npm run build - -# Any of these could work to allow external domains -# --allowed-hosts .kalisio.xyz -# --disable-host-check -# --public maputnik.kalisio.xyz:8888 - -CMD npm run start -- --host 0.0.0.0 --allowed-hosts .${SUBDOMAIN} diff --git a/docs/reference/environment.md b/docs/reference/environment.md index b225a732b..8ed5fe9b0 100644 --- a/docs/reference/environment.md +++ b/docs/reference/environment.md @@ -86,15 +86,10 @@ $kargo build mapserver | Variable | Description | Default value | | --- | --- | --- | -| `MAPUTNIK_IMAGE` | The image to be used. | `localhost:5000/maputnik` | -| `MAPUTNIK_TAG` | The version to be used. | `1.5.0` | +| `MAPUTNIK_IMAGE` | The image to be used. | `maputnik/editor` | +| `MAPUTNIK_TAG` | The version to be used. | `latest` | | `MAPUTNIK_REPLICAS` | The number of replicas. | `1` | -::: warning -The **Maputnik** application is preconfigured to use a local image that must be built using the [build](./cli.md#build) command: -```bash -$kargo build maputnik -``` ::: ### MongoDB