zrhoffman commented on code in PR #7357:
URL: https://github.com/apache/trafficcontrol/pull/7357#discussion_r1122357415
##########
.github/actions/tpv2-integration-tests/entrypoint.sh:
##########
@@ -26,7 +27,8 @@ envsubst
<../../.github/actions/tpv2-integration-tests/cdn.json >./cdn.conf
./traffic_ops_golang --cfg ./cdn.conf --dbcfg
../../.github/actions/tpv2-integration-tests/database.json > out.log 2>&1 &
cd "${GITHUB_WORKSPACE}/experimental/traffic-portal/dist/traffic-portal"
-node ./server/main.js --port 4200 -d
${GITHUB_WORKSPACE}/experimental/traffic-portal/dist/traffic-portal/browser -k
-t 'https://localhost:6443/' &
+envsubst <../../../../.github/actions/tpv2-integration-tests/config.json
>./config.json
Review Comment:
`../../../..` can be `${GITHUB_WORKSPACE}`
##########
infrastructure/docker/build/Dockerfile-traffic_portal:
##########
@@ -37,15 +36,17 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
epel-release && \
yum -y clean all
-### traffic_portal specific
-FROM common-dependencies AS traffic-portal
-
RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash - && \
- yum -y install make nodejs && \
- npm -g install grunt-cli sass
-
-###
+ yum -y install nodejs
+FROM common-dependencies as traffic_portal_v1
+RUN npm -g install make grunt-cli sass
CMD /trafficcontrol/build/clean_build.sh traffic_portal
+FROM common-dependencies as traffic_portal_v2
+RUN mkdir -p /trafficcontrol/experimental/traffic-portal
+RUN ln -s /trafficcontrol/experimental/traffic-portal/
/trafficcontrol/traffic_portal_v2
+CMD /trafficcontrol/build/clean_build.sh traffic_portal_v2
+
+
Review Comment:
Nit: This line can be removed, but I won't hold up the PR for it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
