This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 2b0fad0 Remove Basho Apt repo (#5275)
2b0fad0 is described below
commit 2b0fad0e7ac889a1b0d4605ecab3271fc94f65a7
Author: Zach Hoffman <[email protected]>
AuthorDate: Thu Nov 12 12:17:46 2020 -0700
Remove Basho Apt repo (#5275)
---
CHANGELOG.md | 3 +++
infrastructure/cdn-in-a-box/traffic_vault/Dockerfile | 1 +
2 files changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f66a9..776a79b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Traffic Ops: added validation for assigning ORG servers to topology-based
delivery services
- Added locationByDeepCoverageZone to the `crs/stats/ip/{ip}` endpoint in the
Traffic Router API
+### Fixed
+- Fixed #5274 - CDN in a Box's Traffic Vault image failed to build due to
Basho's repo responding with 402 Payment Required. The repo has been removed
from the image.
+
## [5.0.0] - 2020-10-20
### Added
- Traffic Ops Ort: Disabled ntpd verification (ntpd is deprecated in CentOS)
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
b/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
index 4172554..ed08908 100644
--- a/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_vault/Dockerfile
@@ -22,6 +22,7 @@ RUN rm -rfv /etc/riak/prestart.d/* /etc/riak/poststart.d/*
RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \
&& echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \
+ && rm /etc/apt/sources.list.d/basho_riak.list \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools
ca-certificates dnsutils gettext-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf
/etc/apt/apt.conf.d/docker-gzip-indexes