steve
/
geoserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GEOS-11169] Correct release.sh STABLE_PLUGIN_URL and COMMUNITY_PLUGIN_URL

pull/30/head
Jody Garnett 2023-10-23 00:28:04 -04:00
parent 66456cdf83
commit d4656efdf3
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -66,7 +66,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \
FROM tomcat as install FROM tomcat as install
ARG GS_VERSION=2.23.1 ARG GS_VERSION=2.24.0
ARG GS_BUILD=release ARG GS_BUILD=release
ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions
ARG COMMUNITY_PLUGIN_URL='' ARG COMMUNITY_PLUGIN_URL=''

24
build/release.sh
View File

@ -27,9 +27,9 @@ else
fi fi
if [[ "$VERSION" == *"-RC"* ]]; then if [[ "$VERSION" == *"-RC"* ]]; then
# release candidate branch release # release candidate branch release
BRANCH="${VERSION:0:4}-RC" BRANCH="${VERSION:0:4}-RC"
TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
else else
if [[ "${VERSION:0:4}" == "$MAIN" ]]; then if [[ "${VERSION:0:4}" == "$MAIN" ]]; then
# main branch snapshot release # main branch snapshot release
@ -37,12 +37,12 @@ else
TAG=geoserver-docker.osgeo.org/geoserver:$MAIN.x TAG=geoserver-docker.osgeo.org/geoserver:$MAIN.x
else else
if [[ "$VERSION" == *"-SNAPSHOT"* ]]; then if [[ "$VERSION" == *"-SNAPSHOT"* ]]; then
# stable or maintenance branch snapshot release # stable or maintenance branch snapshot release
BRANCH="${VERSION:0:4}.x" BRANCH="${VERSION:0:4}.x"
TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH TAG=geoserver-docker.osgeo.org/geoserver:$BRANCH
else else
BRANCH="${VERSION:0:4}.x" BRANCH="${VERSION:0:4}.x"
TAG=geoserver-docker.osgeo.org/geoserver:$VERSION TAG=geoserver-docker.osgeo.org/geoserver:$VERSION
fi fi
fi fi
fi fi
@ -62,8 +62,8 @@ if [[ $1 == *build* ]]; then
# todo: --no-cache-filter download,install # todo: --no-cache-filter download,install
docker build \ docker build \
--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip \ --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip \
--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest/ \ --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest \
--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest/ \ --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest \
--build-arg GS_VERSION=$VERSION \ --build-arg GS_VERSION=$VERSION \
--build-arg GS_BUILD=$BUILD \ --build-arg GS_BUILD=$BUILD \
-t $TAG . -t $TAG .
@ -71,8 +71,8 @@ if [[ $1 == *build* ]]; then
echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ." echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
docker build \ docker build \
--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/$BRANCH/geoserver-$BRANCH-latest-war.zip \ --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/$BRANCH/geoserver-$BRANCH-latest-war.zip \
--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/ext-latest/ \ --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/ext-latest \
--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest/ \ --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest \
--build-arg GS_VERSION=$VERSION \ --build-arg GS_VERSION=$VERSION \
--build-arg GS_BUILD=$BUILD \ --build-arg GS_BUILD=$BUILD \
-t $TAG . -t $TAG .

2
docker-compose-demo.yml
View File

@ -4,7 +4,7 @@ services:
build: build:
context: . context: .
args: args:
- GEOSERVER_VERSION=2.22.0 - GEOSERVER_VERSION=2.24.0
- CORS_ENABLED=true - CORS_ENABLED=true
- CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
ports: ports: