这是indexloc提供的服务，不要输入任何密码
Skip to content

[bugfix] in nginx.conf.template getting from /app directory #1331

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 20, 2015
Merged

[bugfix] in nginx.conf.template getting from /app directory #1331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/nginx-vhosts/commands
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ case "$1" in
fi

DOKKU_APP_CIDS=($(get_app_container_ids $APP))
docker cp "${DOKKU_APP_CID[0]}:/app/nginx.conf.template" "$APP_NGINX_TEMPLATE" 2> /dev/null || true
docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
Copy link
Member

@josegonzalez josegonzalez Jul 20, 2015

Choose a reason for hiding this comment

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

Doesn't $APP_NGINX_TEMPLATE need to be the full path?

Copy link
Contributor Author

@alexkruegger alexkruegger Jul 20, 2015

Choose a reason for hiding this comment

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

As I tested it - no. You should define only directory where template should be stored. If you use $APP_NGINX_TEMPLATE as the full path, docker will create directory with this name, not the file.

Copy link
Member

@michaelshobbs michaelshobbs Jul 20, 2015

Choose a reason for hiding this comment

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

👍 on fixing $DOKKU_APP_CIDS. I missed that one in review. Any reason to change from using $APP_NGINX_TEMPLATE? I like variable re-use. 😄

EDIT: @alexkruegger, I didn't see your comment before posting. @josegonzalez I was incorrect in my testing method. @alexkruegger's comment is definitely correct.

Copy link
Contributor Author

@alexkruegger alexkruegger Jul 20, 2015

Choose a reason for hiding this comment

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

:) Thank you for nice tool and fast response! Happy coding! )


[[ -f "$DOKKU_ROOT/ENV" ]] && source $DOKKU_ROOT/ENV
[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
Expand Down