Skip to content

Commits

Permalink
master
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on Nov 9, 2017

  1. Merge pull request docker#25 from docker/version_bump 

    update shibb and java
    @pcaskey
    pcaskey committed Nov 9, 2017
    Copy the full SHA
    dc97a05 View commit details

  2. update shibb and java 

    Shibb from 3.3.1 to 3.3.2
Java from 8u131 to 8u152
    @pcaskey
    pcaskey committed Nov 9, 2017
    Copy the full SHA
    9101af4 View commit details

  3. Update README.md

    @pcaskey
    pcaskey committed Nov 9, 2017
    Copy the full SHA
    d1fad71 View commit details

Commits on Nov 8, 2017

  1. Update Dockerfile

    @pcaskey
    pcaskey committed Nov 8, 2017
    Copy the full SHA
    b55cd69 View commit details

Commits on Nov 7, 2017

  1. Update Dockerfile

    @pcaskey
    pcaskey committed Nov 7, 2017
    Copy the full SHA
    631178b View commit details

Commits on Nov 5, 2017

  1. Update Dockerfile

    @pcaskey
    pcaskey committed Nov 5, 2017
    Copy the full SHA
    653096d View commit details

Commits on Oct 31, 2017

  1. Merge pull request docker#24 from docker/remove-script 

    Delete configBuilder.sh
    @pcaskey
    pcaskey committed Oct 31, 2017
    Copy the full SHA
    51ef9b1 View commit details

  2. Delete configBuilder.sh

    @pcaskey
    pcaskey committed Oct 31, 2017
    Copy the full SHA
    29df7d2 View commit details

Commits on Jul 17, 2017

  1. Merge pull request docker#23 from docker/noIntermediate 

    bugfixes
    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    be2c316 View commit details

  2. bug

    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    f254d82 View commit details

  3. bugfixes

    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    698be58 View commit details

  4. bugfix

    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    99a4a6a View commit details

  5. Merge pull request docker#22 from docker/noIntermediate 

    bug fixes
    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    2279547 View commit details

  6. more bug fixes

    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    483a01b View commit details

  7. bug fixes in configBuilder.sh

    @pcaskey
    pcaskey committed Jul 17, 2017
    Copy the full SHA
    65380e6 View commit details

Commits on Jul 13, 2017

  1. Merge pull request docker#21 from docker/noIntermediate 

    mods for hybrid config
    @pcaskey
    pcaskey committed Jul 13, 2017
    Copy the full SHA
    dc41858 View commit details

  2. mods for hybrid config

    @pcaskey
    pcaskey committed Jul 13, 2017
    Copy the full SHA
    c63eccc View commit details

Commits on Jul 11, 2017

  1. Merge pull request docker#20 from docker/noIntermediate 

    add hybrid/swarm config option
    @pcaskey
    pcaskey committed Jul 11, 2017
    Copy the full SHA
    0567f84 View commit details

  2. add hybrid/swarm config option

    @pcaskey
    pcaskey committed Jul 11, 2017
    Copy the full SHA
    06500bd View commit details

Commits on Jul 7, 2017

  1. Merge pull request docker#19 from docker/noIntermediate 

    bump tomcat version
    @pcaskey
    pcaskey committed Jul 7, 2017
    Copy the full SHA
    4a028df View commit details

  2. bump tomcat version

    @pcaskey
    pcaskey committed Jul 7, 2017
    Copy the full SHA
    d1b721f View commit details

Commits on Jun 29, 2017

  1. Merge pull request docker#18 from docker/noIntermediate 

    add script to sync files to swarm
    @pcaskey
    pcaskey committed Jun 29, 2017
    Copy the full SHA
    249f857 View commit details

  2. add a few extra checks to sync script

    @pcaskey
    pcaskey committed Jun 29, 2017
    Copy the full SHA
    e0603e1 View commit details

  3. add script to sync swarm files

    @pcaskey
    pcaskey committed Jun 29, 2017
    Copy the full SHA
    813b51e View commit details

Commits on Jun 28, 2017

  1. Merge pull request docker#17 from docker/noIntermediate 

    add health check to Dockerfile
    @pcaskey
    pcaskey committed Jun 28, 2017
    Copy the full SHA
    b5d003f View commit details

  2. add health check to Dockerfile

    @pcaskey
    pcaskey committed Jun 28, 2017
    Copy the full SHA
    61aed2c View commit details

Commits on Jun 16, 2017

  1. Merge pull request docker#16 from docker/noIntermediate 

    bugfixes
    @pcaskey
    pcaskey committed Jun 16, 2017
    Copy the full SHA
    2571f3e View commit details

  2. bugfixes

    @pcaskey
    pcaskey committed Jun 16, 2017
    Copy the full SHA
    1edf211 View commit details

Commits on Jun 8, 2017

  1. Merge pull request docker#15 from docker/noIntermediate 

    more bugfixes
    @pcaskey
    pcaskey committed Jun 8, 2017
    Copy the full SHA
    86f84b1 View commit details

  2. more bugfixes

    @pcaskey
    pcaskey committed Jun 8, 2017
    Copy the full SHA
    4ad3b2c View commit details

  3. Merge pull request docker#14 from docker/noIntermediate 

    bug fix
    @pcaskey
    pcaskey committed Jun 8, 2017
    Copy the full SHA
    bf0995d View commit details

  4. bug fix

    @pcaskey
    pcaskey committed Jun 8, 2017
    Copy the full SHA
    a521b9a View commit details

Commits on Jun 7, 2017

  1. Merge pull request docker#13 from docker/noIntermediate 

    bug fixes
    @pcaskey
    pcaskey committed Jun 7, 2017
    Copy the full SHA
    34af806 View commit details

  2. bug fixes

    @pcaskey
    pcaskey committed Jun 7, 2017
    Copy the full SHA
    d3ebffd View commit details

Commits on Jun 6, 2017

  1. Merge pull request docker#12 from docker/noIntermediate 

    bugfix in dockerfile
    @pcaskey
    pcaskey committed Jun 6, 2017
    Copy the full SHA
    7ed9b56 View commit details
Older