This is an automated email from the ASF dual-hosted git repository.
mitchell852 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 a6f7d2e CIAB: remove tccache
a6f7d2e is described below
commit a6f7d2e5224616ef228a0c9a3f1e075e0d263d1c
Author: Shihta Kuan <[email protected]>
AuthorDate: Tue Mar 5 10:39:16 2019 +0800
CIAB: remove tccache
---
infrastructure/cdn-in-a-box/cache/Dockerfile | 5 ++--
.../cdn-in-a-box/{mid/Dockerfile => cache/run.sh} | 20 +++++++++-------
infrastructure/cdn-in-a-box/docker-compose.yml | 24 +++++--------------
infrastructure/cdn-in-a-box/edge/Dockerfile | 28 ----------------------
4 files changed, 20 insertions(+), 57 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/cache/Dockerfile
b/infrastructure/cdn-in-a-box/cache/Dockerfile
index 2343d7f..e56f0da 100644
--- a/infrastructure/cdn-in-a-box/cache/Dockerfile
+++ b/infrastructure/cdn-in-a-box/cache/Dockerfile
@@ -53,6 +53,7 @@ ADD traffic_control/clients/python /opt/Apache-TrafficControl/
WORKDIR /opt
-RUN touch /var/log/ort.log && pip3 install ./Apache-TrafficControl && pip3
install ./ort && cp ort/traffic_ops_ort.crontab
/etc/cron.d/traffic_ops_ort-cron-template
+RUN touch /var/log/ort.log && pip3 install ./Apache-TrafficControl && pip3
install ./ort && cp ort/traffic_ops_ort.crontab
/etc/cron.d/traffic_ops_ort-cron-template && mkdir -p /opt/init.d
-CMD exit
+ADD infrastructure/cdn-in-a-box/cache/run.sh
infrastructure/cdn-in-a-box/traffic_ops/to-access.sh
infrastructure/cdn-in-a-box/enroller/server_template.json /
+CMD /run.sh
diff --git a/infrastructure/cdn-in-a-box/mid/Dockerfile
b/infrastructure/cdn-in-a-box/cache/run.sh
old mode 100644
new mode 100755
similarity index 70%
rename from infrastructure/cdn-in-a-box/mid/Dockerfile
rename to infrastructure/cdn-in-a-box/cache/run.sh
index 2adfd5c..892aea1
--- a/infrastructure/cdn-in-a-box/mid/Dockerfile
+++ b/infrastructure/cdn-in-a-box/cache/run.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,14 +17,14 @@
# specific language governing permissions and limitations
# under the License.
-############################################################
-# Dockerfile to build Mid-Tier Cache container images for
-# Apache Traffic Control
-# Based on CentOS 7.2
-############################################################
-
-FROM tccache:latest
+set -e
+set -x
+set -m
-ADD mid/run.sh traffic_ops/to-access.sh enroller/server_template.json /
+for f in /opt/init.d/*; do
+ echo "$f"
+ $f
+done
-CMD /run.sh
+# tail -f /dev/null
+/bin/bash
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml
b/infrastructure/cdn-in-a-box/docker-compose.yml
index 0486e41..cfbc774 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -209,23 +209,12 @@ services:
- variables.env
hostname: trafficvault
- # Apache Traffic Server (ATS) caches defined here
- # base image from which all other caches inherit (builds and installs
ATS+plugins)
- tccache:
- build:
- context: ../..
- dockerfile: infrastructure/cdn-in-a-box/cache/Dockerfile
- image: tccache:latest
-
# edge cache
edge:
privileged: True
build:
- context: .
- dockerfile: edge/Dockerfile
- depends_on:
- - enroller
- - tccache
+ context: ../..
+ dockerfile: infrastructure/cdn-in-a-box/cache/Dockerfile
domainname: infra.ciab.test
env_file:
- variables.env
@@ -233,17 +222,15 @@ services:
volumes:
- ./dns/set-dns.sh:/usr/local/sbin/set-dns.sh
- ./dns/insert-self-into-dns.sh:/usr/local/sbin/insert-self-into-dns.sh
+ - ./edge/run.sh:/opt/init.d/99-run.sh
- shared:/shared
# mid cache
mid:
privileged: True
build:
- context: .
- dockerfile: mid/Dockerfile
- depends_on:
- - enroller
- - tccache
+ context: ../..
+ dockerfile: infrastructure/cdn-in-a-box/cache/Dockerfile
domainname: infra.ciab.test
env_file:
- variables.env
@@ -251,6 +238,7 @@ services:
volumes:
- ./dns/set-dns.sh:/usr/local/sbin/set-dns.sh
- ./dns/insert-self-into-dns.sh:/usr/local/sbin/insert-self-into-dns.sh
+ - ./mid/run.sh:/opt/init.d/99-run.sh
- shared:/shared
# origin provides the content to be distributed through the CDN caches
diff --git a/infrastructure/cdn-in-a-box/edge/Dockerfile
b/infrastructure/cdn-in-a-box/edge/Dockerfile
deleted file mode 100644
index c1b175d..0000000
--- a/infrastructure/cdn-in-a-box/edge/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-############################################################
-# Dockerfile to build Edge-Tier Cache container images for
-# Apache Traffic Control
-# Based on CentOS 7.2
-############################################################
-
-FROM tccache:latest
-
-ADD edge/run.sh traffic_ops/to-access.sh enroller/server_template.json /
-
-CMD /run.sh
