diff --git a/deploy.sh b/deploy.sh index da7c3bf..c9c63eb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -42,7 +42,7 @@ frontend=${frontend:-false} frontendRelease=${frontendRelease:-LATEST} # The Git location for the frontend -frontendGit=${frontendGit:-"git:maproulette/maproulette3"} +frontendGit=${frontendGit:-"git:maproulette/maproulette4"} # Whether to deploy the API api=${api:-false} diff --git a/frontend/Dockerfile b/frontend/Dockerfile index b8609ab..080d5a7 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -2,9 +2,10 @@ ARG NODE_TAG=22-bullseye ARG NGINX_TAG=1.25-alpine FROM docker.io/library/node:${NODE_TAG} as builder -ARG GIT="maproulette/maproulette3" +ARG GIT="maproulette/maproulette4" ARG CACHEBUST=2 ARG VERSION="LATEST" +ARG GITHUB_TOKEN="" RUN \ apt-get update && \ @@ -20,9 +21,9 @@ RUN \ echo "${CACHEBUST}" && \ echo "${VERSION}" && \ if [ "${VERSION}" = "LATEST" ]; then \ - git clone --depth 1 https://github.com/${GIT}.git /maproulette-frontend ; \ + git clone --depth 1 https://${GITHUB_TOKEN}@github.com/${GIT}.git /maproulette-frontend ; \ else \ - git clone --depth 1 --branch ${VERSION} https://github.com/${GIT}.git /maproulette-frontend ; \ + git clone --depth 1 --branch ${VERSION} https://${GITHUB_TOKEN}@github.com/${GIT}.git /maproulette-frontend ; \ fi WORKDIR /maproulette-frontend diff --git a/frontend/docker.sh b/frontend/docker.sh index f976414..148b884 100755 --- a/frontend/docker.sh +++ b/frontend/docker.sh @@ -35,6 +35,7 @@ fi echo "Building container image for MapRoulette frontend Version: $IMAGE_TAG, Repo: ${git[1]}" docker build \ --pull \ + --no-cache \ -t maproulette/maproulette-frontend:"${IMAGE_TAG}" \ --build-arg VERSION="${VERSION}" \ --build-arg GIT="${git[1]}" \ diff --git a/frontend/nginx-config b/frontend/nginx-config index a9336a0..36082c1 100644 --- a/frontend/nginx-config +++ b/frontend/nginx-config @@ -1,5 +1,5 @@ upstream api { - server maproulette-api:9000; + server 127.0.0.1:9000; } server { listen 3000 default_server;