diff --git a/Dockerfile b/Dockerfile index 7740dd3..e9290e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN yum -y update && yum -y install \ WORKDIR /usr/local/src -ARG PHP_VERSION=7.2.5 +ARG PHP_VERSION=7.2.13 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz RUN mkdir php-src \ @@ -112,7 +112,7 @@ COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/ COPY --from=php-build /usr/local/include/php /usr/local/include/php/ COPY --from=php-build /usr/local/bin /usr/local/bin/ -ARG COMANAGE_REGISTRY_VERSION=3.1.1 +ARG COMANAGE_REGISTRY_VERSION=3.2.0 ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/${COMANAGE_REGISTRY_VERSION}.tar.gz ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION} @@ -191,7 +191,7 @@ COPY docker-supervisord-entrypoint /usr/local/bin/ # following line (to prevent other scripts from processing it). ##### ENV TIER_BEACON_OPT_OUT True -ENV TIER_RELEASE=180801 +ENV TIER_RELEASE=181201 ENV TIER_MAINTAINER=tier ENTRYPOINT ["docker-supervisord-entrypoint"] diff --git a/Jenkinsfile b/Jenkinsfile index 278e7f7..e8652d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { maintainer = "t" imagename = 'g' tag = 'l' - version='3.1.1' + version='3.2.0-rc1' } stages { stage('Setting build context') { @@ -34,7 +34,7 @@ pipeline { steps { script { docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { - def baseImg = docker.build("$maintainer/$imagename", "--build-arg COMANAGE_REGISTRY_VERSION=$version .") + def baseImg = docker.build("$maintainer/$imagename", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version .") baseImg.push("$tag") } } diff --git a/common.bash b/common.bash index 5b0a486..4e20c57 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="tier" imagename="comanage" -COMANAGE_REGISTRY_VERSION="3.1.1" +COMANAGE_REGISTRY_VERSION="3.2.0-rc1"