Skip to content
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: nginx/docker-nginx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4d5453
Choose a base ref
...
head repository: radhus/docker-nginx-libressl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e3ad6a
Choose a head ref
  • 9 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 10, 2016

  1. Remove unsupported targets

    Only support mainline/alpine for LibreSSL.
    radhus committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    d23251b View commit details
    Browse the repository at this point in the history
  2. Build nginx mainline with LibreSSL

    Modify the Dockerfile to fetch LibreSSL 2.5.0 and build nginx against
    it instead of OpenSSL.
    radhus committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    beb9b6e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8e49654 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Merge upstream branch 'master'

    From https://github.com/nginxinc/docker-nginx
    
    Conflicts:
    	mainline/alpine/Dockerfile
    	mainline/jessie/Dockerfile
    radhus committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    9a11849 View commit details
    Browse the repository at this point in the history
  2. Remove linebreaks in README.md

    radhus committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    b98f960 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2016

  1. Merge upstream branch 'master'

    From https://github.com/nginxinc/docker-nginx
    
    Conflicts:
    	mainline/alpine/Dockerfile
    	mainline/jessie/Dockerfile
    	stable/alpine/Dockerfile
    	stable/jessie/Dockerfile
    radhus committed Dec 25, 2016
    Configuration menu
    Copy the full SHA
    6bccbdd View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2017

  1. Use Alpine 3.5: removes building own LibreSSL

    Now that Alpine 3.5 is released, and an official Docker image exists for
    it, lets use that and avoid building our own LibreSSL in the image.
    
    Restores the stable branch for Alpine and lets that use 3.5 as well.
    radhus committed Jan 22, 2017
    Configuration menu
    Copy the full SHA
    abfa734 View commit details
    Browse the repository at this point in the history
  2. Merge upstream branch 'master'

    radhus committed Jan 22, 2017
    Configuration menu
    Copy the full SHA
    d2dc771 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Merge upstream branch 'master'

    radhus committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    4e3ad6a View commit details
    Browse the repository at this point in the history
Loading