Skip to content

Commit

Permalink
fix: remove references to JIRA_BASE_URL as it is overridden with JIRA…
Browse files Browse the repository at this point in the history
…_HOSTNAME

This is a breaking change for our jira broker client users, deploy with care.
  • Loading branch information
Anton Drukh committed Oct 31, 2018
1 parent d8fc0be commit 550db77
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
3 changes: 0 additions & 3 deletions client-templates/jira/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ JIRA_PASSWORD=
# your Jira Server hostname, i.e. jira.yourdomain.com
JIRA_HOSTNAME=

# Your Jira Server URL, including scheme and hostname
JIRA_BASE_URL=https://$JIRA_HOSTNAME

# the url of your broker client (including scheme and port)
# BROKER_CLIENT_URL=

Expand Down
20 changes: 10 additions & 10 deletions client-templates/jira/accept.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"//": "get jira server info",
"method": "GET",
"path": "/rest/api/2/serverInfo",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -18,7 +18,7 @@
"//": "identify user",
"method": "GET",
"path": "/rest/api/2/myself",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -29,7 +29,7 @@
"//": "used to get a list of all Jira projects",
"method": "GET",
"path": "/rest/api/2/project",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -48,7 +48,7 @@
"//": "used to get a Jira project",
"method": "GET",
"path": "/rest/api/2/project/:project",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -59,7 +59,7 @@
"//": "used to get createmeta for a jira project & issueType",
"method": "GET",
"path": "/rest/api/2/issue/createmeta",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -70,7 +70,7 @@
"//": "used to get jira issue",
"method": "GET",
"path": "/rest/api/2/issue/:issue",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -81,7 +81,7 @@
"//": "used to create jira issue",
"method": "POST",
"path": "/rest/api/2/issue",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -92,7 +92,7 @@
"//": "used to create jira issue link",
"method": "POST",
"path": "/rest/api/2/issue/:issue/remotelink",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -103,7 +103,7 @@
"//": "used to get assignable users",
"method": "GET",
"path": "/rest/api/2/user/assignable/search",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand All @@ -114,7 +114,7 @@
"//": "used to get available components",
"method": "GET",
"path": "/rest/api/2/project/:project/components",
"origin": "${JIRA_BASE_URL}",
"origin": "https://${JIRA_HOSTNAME}",
"auth": {
"scheme": "basic",
"username": "${JIRA_USERNAME}",
Expand Down
3 changes: 0 additions & 3 deletions dockerfiles/jira/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ ENV JIRA_PASSWORD <password>
# Your Jira Server host
ENV JIRA_HOSTNAME your.jira.server.hostname

# Your Jira Server URL, including scheme and hostname
ENV JIRA_BASE_URL https://$JIRA_HOSTNAME

# The port used by the broker client to accept internal connections
# Default value is 7341
ENV PORT 7341
Expand Down

0 comments on commit 550db77

Please sign in to comment.