Skip to content

Commit

Permalink
Update_Dependencies (istio#3614)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

[DO NOT MERGE] Auto PR to update dependencies of istio

This PR will be merged automatically once checks are successful.
```release-note
none
```
  • Loading branch information
istio-testing authored and istio-merge-robot committed Feb 20, 2018
1 parent 7dc6800 commit e41f22c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion istio.VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export MIXER_TAG="replace-by-actual-tag"
export PILOT_HUB="gcr.io/istio-testing"
export PILOT_TAG="replace-by-actual-tag"
export ISTIOCTL_URL="https://storage.googleapis.com/istio-artifacts/pilot/replace-by-actual-tag/artifacts/istioctl"
export PROXY_TAG="e14f321e4ffaac83ba6c045e29fc4d14a505c632"
export PROXY_TAG="54cccfe052619ddd632e267ba0bc57438c3a12c5"
export PROXY_DEBUG=""
export ISTIO_NAMESPACE="istio-system"
export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/replace-by-actual-tag/artifacts/debs"
Expand Down
6 changes: 3 additions & 3 deletions istio.deps
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
"repoName": "proxy",
"prodBranch": "master",
"file": "pilot/docker/Dockerfile.proxy",
"lastStableSHA": "e14f321e4ffaac83ba6c045e29fc4d14a505c632"
"lastStableSHA": "54cccfe052619ddd632e267ba0bc57438c3a12c5"
},
{
"name": "/envoy-debug",
"repoName": "proxy",
"prodBranch": "master",
"file": "pilot/docker/Dockerfile.proxy_debug",
"lastStableSHA": "e14f321e4ffaac83ba6c045e29fc4d14a505c632"
"lastStableSHA": "54cccfe052619ddd632e267ba0bc57438c3a12c5"
},
{
"name": "PROXY_TAG",
"repoName": "proxy",
"prodBranch": "master",
"file": "istio.VERSION",
"lastStableSHA": "e14f321e4ffaac83ba6c045e29fc4d14a505c632"
"lastStableSHA": "54cccfe052619ddd632e267ba0bc57438c3a12c5"
}
]
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.proxy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
FROM gcr.io/istio-testing/envoy:e14f321e4ffaac83ba6c045e29fc4d14a505c632
FROM gcr.io/istio-testing/envoy:54cccfe052619ddd632e267ba0bc57438c3a12c5
ADD pilot-agent /usr/local/bin/pilot-agent

COPY envoy_pilot.json /etc/istio/proxy/envoy_pilot.json
Expand Down
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.proxy_debug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
FROM gcr.io/istio-testing/envoy-debug:e14f321e4ffaac83ba6c045e29fc4d14a505c632
FROM gcr.io/istio-testing/envoy-debug:54cccfe052619ddd632e267ba0bc57438c3a12c5
ADD pilot-agent /usr/local/bin/pilot-agent

COPY envoy_pilot.json /etc/istio/proxy/envoy_pilot.json
Expand Down

0 comments on commit e41f22c

Please sign in to comment.