Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/COmanage
base: 7d8d13a
Choose a base ref
...
head repository: docker/COmanage
compare: a23919f
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 14, 2018

  1. Update Dockerfile

    chubing committed Dec 14, 2018
    Copy the full SHA
    d7bc0a7 View commit details
  2. Update Dockerfile

    chubing committed Dec 14, 2018
    Copy the full SHA
    0de0eb1 View commit details

Commits on Dec 20, 2018

  1. Update Dockerfile

    chubing committed Dec 20, 2018
    Copy the full SHA
    ab92771 View commit details
  2. Update Jenkinsfile

    chubing committed Dec 20, 2018
    Copy the full SHA
    f009b44 View commit details
  3. Update common.bash

    chubing committed Dec 20, 2018
    Copy the full SHA
    05b90c9 View commit details
  4. Update Dockerfile

    chubing committed Dec 20, 2018
    Copy the full SHA
    868deac View commit details

Commits on Jan 7, 2019

  1. bump COmanage and PHP

    pcaskey committed Jan 7, 2019
    Copy the full SHA
    a23919f View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 Dockerfile
  2. +2 −2 Jenkinsfile
  3. +1 −1 common.bash
6 changes: 3 additions & 3 deletions 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"]
4 changes: 2 additions & 2 deletions 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")
}
}
2 changes: 1 addition & 1 deletion common.bash
@@ -1,3 +1,3 @@
maintainer="tier"
imagename="comanage"
COMANAGE_REGISTRY_VERSION="3.1.1"
COMANAGE_REGISTRY_VERSION="3.2.0-rc1"