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 3cdfa3f Ciab scope drop (#4821)
3cdfa3f is described below
commit 3cdfa3f12a598baf6758909c65e5d4743ec96d05
Author: ocket8888 <[email protected]>
AuthorDate: Wed Jun 24 07:51:27 2020 -0600
Ciab scope drop (#4821)
* Reduced the scope of the TO service context
* Reduced the scope of the readiness service's context
* updated ignore and debugging service definition files
---
.../cdn-in-a-box/docker-compose.readiness.yml | 4 ++--
infrastructure/cdn-in-a-box/docker-compose.yml | 6 +++---
.../optional/docker-compose.debugging.yml | 6 +++---
infrastructure/cdn-in-a-box/readiness/Dockerfile | 2 +-
.../cdn-in-a-box/traffic_ops/Dockerfile-go | 24 +++++++++++-----------
.../traffic_ops/Dockerfile-go.dockerignore | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/docker-compose.readiness.yml
b/infrastructure/cdn-in-a-box/docker-compose.readiness.yml
index 3a29358..dd5f1b9 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.readiness.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.readiness.yml
@@ -35,8 +35,8 @@ version: '2.1'
services:
readiness:
build:
- context: ../..
- dockerfile: infrastructure/cdn-in-a-box/readiness/Dockerfile
+ context: .
+ dockerfile: readiness/Dockerfile
env_file:
- variables.env
hostname: readiness
diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml
b/infrastructure/cdn-in-a-box/docker-compose.yml
index 9ea913b..3bcc1a2 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -58,10 +58,10 @@ services:
# defined below
trafficops:
build:
- context: ../..
- dockerfile: infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+ context: .
+ dockerfile: traffic_ops/Dockerfile-go
args:
- TRAFFIC_OPS_RPM:
infrastructure/cdn-in-a-box/traffic_ops/traffic_ops.rpm
+ TRAFFIC_OPS_RPM: traffic_ops/traffic_ops.rpm
depends_on:
- db
- enroller
diff --git a/infrastructure/cdn-in-a-box/optional/docker-compose.debugging.yml
b/infrastructure/cdn-in-a-box/optional/docker-compose.debugging.yml
index 9e14dba..9e38c48 100644
--- a/infrastructure/cdn-in-a-box/optional/docker-compose.debugging.yml
+++ b/infrastructure/cdn-in-a-box/optional/docker-compose.debugging.yml
@@ -66,10 +66,10 @@ services:
trafficops-go-nondebug:
image: trafficops-go
build:
- context: ../..
- dockerfile: infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+ context: .
+ dockerfile: traffic_ops/Dockerfile-go
args:
- TRAFFIC_OPS_RPM:
infrastructure/cdn-in-a-box/traffic_ops/traffic_ops.rpm
+ TRAFFIC_OPS_RPM: traffic_ops/traffic_ops.rpm
command: /usr/bin/true
# The trafficops-perl-nondebug service exists to ensure that the
trafficops-perl
# base image exists before building trafficmonitor-debug.
diff --git a/infrastructure/cdn-in-a-box/readiness/Dockerfile
b/infrastructure/cdn-in-a-box/readiness/Dockerfile
index e8b94ff..8267322 100644
--- a/infrastructure/cdn-in-a-box/readiness/Dockerfile
+++ b/infrastructure/cdn-in-a-box/readiness/Dockerfile
@@ -27,7 +27,7 @@ RUN apk add --no-cache --update \
# MANIFEST
# to-access.sh (sourced, get to-get and env vars)
# run.sh (wait on TO, then to-get deliveryservices, then curl the
exampleURLs)
-COPY ./infrastructure/cdn-in-a-box/readiness/run.sh
./infrastructure/cdn-in-a-box/traffic_ops/to-access.sh /opt/readiness/
+COPY readiness/run.sh traffic_ops/to-access.sh /opt/readiness/
WORKDIR /opt/readiness
CMD ./run.sh
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
index 8f78215..dcde0e9 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go
@@ -45,18 +45,18 @@ FROM trafficops-common-deps
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg
TRAFFIC_OPS_RPM=... Can be local file or http://...
#
-ARG TRAFFIC_OPS_RPM=infrastructure/cdn-in-a-box/traffic_ops/traffic_ops.rpm
-
-COPY $TRAFFIC_OPS_RPM /
-RUN to_rpm_filename="$(basename $TRAFFIC_OPS_RPM)" && \
- rpm --install --nodeps --verbose --hash "$to_rpm_filename" && \
- rm "$to_rpm_filename"
-
-COPY infrastructure/cdn-in-a-box/enroller/server_template.json \
- infrastructure/cdn-in-a-box/traffic_ops/config.sh \
- infrastructure/cdn-in-a-box/traffic_ops/run-go.sh \
- infrastructure/cdn-in-a-box/traffic_ops/to-access.sh \
- /
+ARG TRAFFIC_OPS_RPM=traffic_ops/traffic_ops.rpm
+
+COPY $TRAFFIC_OPS_RPM /
+RUN to_rpm_filename="$(basename $TRAFFIC_OPS_RPM)" && \
+ rpm --install --nodeps --verbose --hash "$to_rpm_filename" && \
+ rm "$to_rpm_filename"
+
+COPY enroller/server_template.json \
+ traffic_ops/config.sh \
+ traffic_ops/run-go.sh \
+ traffic_ops/to-access.sh \
+ /
WORKDIR /opt/traffic_ops/app
EXPOSE 443
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go.dockerignore
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go.dockerignore
index 2434df7..5b1659f 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go.dockerignore
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-go.dockerignore
@@ -23,5 +23,5 @@
# - https://github.com/docker/compose/pull/6865
# - https://docs.docker.com/develop/develop-images/build_enhancements/
*
-!infrastructure/cdn-in-a-box/enroller/
-!infrastructure/cdn-in-a-box/traffic_ops/
+!enroller/
+!traffic_ops/
