Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point nginx dockerfile to official repository provided by NGINX, Inc. #197

Merged
merged 1 commit into from
Sep 25, 2014

Conversation

thresheek
Copy link
Contributor

No description provided.

@cpuguy83
Copy link
Contributor

@tianon @yosifkit Let's make sure to also update the Description on Hub since some things will have changed here. (e.g. I don't think /usr/local/nginx/html is where to put static files)

@yosifkit
Copy link
Member

Awesome, we will look over this today.

@thresheek
Copy link
Contributor Author

I've actually did a hack to enable /usr/local/nginx/html to use as a place to put static files in. It worked here if I used something like:
FROM nginx:tagv1
ADD ./files /usr/local/nginx/html

where nginx:tagv1 was the container tag I gave for this new image. But please test that as well - hope I didnt screw up a lot.

@tianon
Copy link
Member

tianon commented Sep 17, 2014

Yeah, that sounds like a fine hack for backwards compatibility 😄. In reviewing this, I've got a few suggestions, but I figured it'd be easier to discuss them as an actual PR to the existing repo (code speaks more clearly than words in this case).

We're really excited to have you guys involved here! 👍

@tianon
Copy link
Member

tianon commented Sep 22, 2014

Pinging here in case you didn't see it there - my comments in the form of a PR: nginxinc/docker-nginx#1

@@ -1,6 +1,6 @@
# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
# maintainer: NGINX Docker Maintainers "docker-maint@nginx.com"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you're in here updating the commit hash, would you mind swapping this to follow the same format as the others as well?

ie:

# maintainer: NGINX Docker Maintainers <[email protected]> (@nginxinc)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

@yosifkit
Copy link
Member

LGTM, ping @tianon for test build

@tianon
Copy link
Member

tianon commented Sep 25, 2014

LGTM

root@c4abd1336708:/usr/src/stackbrew# ./brew-cli --debug --no-namespace -b master --targets nginx git://github.com/thresheek/official-images.git
2014-09-25 17:24:10,798 DEBUG Cloning repo_url=git://github.com/thresheek/official-images.git, ref=master
2014-09-25 17:24:10,801 DEBUG folder = /tmp/tmpK2opzI
2014-09-25 17:24:10,801 DEBUG Cloning git://github.com/thresheek/official-images.git into /tmp/tmpK2opzI
2014-09-25 17:24:10,801 DEBUG Executing "git clone git://github.com/thresheek/official-images.git ." in /tmp/tmpK2opzI
Cloning into '.'...
remote: Counting objects: 1427, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 1427 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (1427/1427), 214.69 KiB | 182.00 KiB/s, done.
Resolving deltas: 100% (802/802), done.
Checking connectivity... done.
2014-09-25 17:24:12,776 DEBUG Checkout ref:master in /tmp/tmpK2opzI
2014-09-25 17:24:12,777 DEBUG Executing "git checkout master" in /tmp/tmpK2opzI
Already on 'master'
Your branch is up-to-date with 'origin/master'.
2014-09-25 17:24:12,783 DEBUG latest: git://github.com/nginxinc/docker-nginx@3713a0157083eb4776e71f5a5aef4b2a5bc03ab1

2014-09-25 17:24:12,783 DEBUG 1: git://github.com/nginxinc/docker-nginx@3713a0157083eb4776e71f5a5aef4b2a5bc03ab1

2014-09-25 17:24:12,783 DEBUG 1.7: git://github.com/nginxinc/docker-nginx@3713a0157083eb4776e71f5a5aef4b2a5bc03ab1

2014-09-25 17:24:12,784 DEBUG 1.7.5: git://github.com/nginxinc/docker-nginx@3713a0157083eb4776e71f5a5aef4b2a5bc03ab1

2014-09-25 17:24:12,784 DEBUG nginx: latest,1,1.7,1.7.5
2014-09-25 17:24:12,784 DEBUG Cloning repo_url=git://github.com/nginxinc/docker-nginx, ref=3713a0157083eb4776e71f5a5aef4b2a5bc03ab1
2014-09-25 17:24:12,784 DEBUG folder = /tmp/tmpfbp1EX
2014-09-25 17:24:12,784 DEBUG Cloning git://github.com/nginxinc/docker-nginx into /tmp/tmpfbp1EX
2014-09-25 17:24:12,784 DEBUG Executing "git clone git://github.com/nginxinc/docker-nginx ." in /tmp/tmpfbp1EX
Cloning into '.'...
remote: Counting objects: 16, done.
remote: Total 16 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (16/16), done.
Resolving deltas: 100% (4/4), done.
Checking connectivity... done.
2014-09-25 17:24:13,260 DEBUG Checkout ref:3713a0157083eb4776e71f5a5aef4b2a5bc03ab1 in /tmp/tmpfbp1EX
2014-09-25 17:24:13,260 DEBUG Executing "git checkout 3713a0157083eb4776e71f5a5aef4b2a5bc03ab1" in /tmp/tmpfbp1EX
Note: checking out '3713a0157083eb4776e71f5a5aef4b2a5bc03ab1'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 3713a01... Merge pull request #1 from tianon/minor-tweaks
2014-09-25 17:24:13,268 INFO Build start: nginx ('git://github.com/nginxinc/docker-nginx', '3713a0157083eb4776e71f5a5aef4b2a5bc03ab1', '.')
2014-09-25 17:25:04,391 INFO Build success: f41a02fcec58 (nginx:latest)
2014-09-25 17:25:04,424 INFO Build success: f41a02fcec58 (nginx:1)
2014-09-25 17:25:04,476 INFO Build success: f41a02fcec58 (nginx:1.7)
2014-09-25 17:25:04,548 INFO Build success: f41a02fcec58 (nginx:1.7.5)

tianon added a commit that referenced this pull request Sep 25, 2014
Point nginx dockerfile to official repository provided by NGINX, Inc.
@tianon tianon merged commit c41eb3b into docker-library:master Sep 25, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants