Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Commit 6cc6356

Browse files
zrhoffmanzrhoffman
committed
Changes for ATC. 8.0.2 release (#8080)
2 parents db383e3 + c210441 commit 6cc6356

File tree

119 files changed

+508
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+508
-310
lines changed

‎.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
ATS_VERSION=9.1.2
2-
GO_VERSION=1.22.1
1+
ATS_VERSION=9.2.4
2+
GO_VERSION=1.23.1
3+
POSTGRES_VERSION=13.16

‎.github/actions/build-ats-test-rpm/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const spawnOptions = {
2020
};
2121

2222
let atcComponent = process.env.ATC_COMPONENT;
23-
const dockerCompose = ["docker-compose", "-f", `${process.env.GITHUB_WORKSPACE}/cache-config/testing/docker/docker-compose-ats-build.yml`];
23+
const dockerCompose = ["docker", "compose", "-f", `${process.env.GITHUB_WORKSPACE}/cache-config/testing/docker/docker-compose-ats-build.yml`];
2424
if (typeof atcComponent !== "string" || atcComponent.length === 0) {
2525
console.error("Missing environment variable ATC_COMPONENT");
2626
process.exit(1);

‎.github/actions/build-ciab/build-ciab.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const spawnOptions = {
2020
stdio: "inherit",
2121
stderr: "inherit"
2222
};
23-
const dockerCompose = ["docker-compose", "-f", "docker-compose.yml", "-f", "docker-compose.readiness.yml"];
23+
const dockerCompose = ["docker", "compose", "-f", "docker-compose.yml", "-f", "docker-compose.readiness.yml"];
2424
process.env.DOCKER_BUILDKIT = 1;
2525
process.env.COMPOSE_DOCKER_CLI_BUILD = 1;
2626

@@ -49,5 +49,5 @@ function runProcess(...commandArguments) {
4949

5050
moveRPMs();
5151
process.chdir(`${process.env.GITHUB_WORKSPACE}/infrastructure/cdn-in-a-box`);
52-
runProcess("make"); // Place the RPMs for docker-compose build. All RPMs should have already been built.
52+
runProcess("make"); // Place the RPMs for docker compose build. All RPMs should have already been built.
5353
runProcess(...dockerCompose, "build", "--parallel");

‎.github/actions/cache-config-integration-tests/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const spawnOptions = {
1919
stderr: "inherit",
2020
};
2121

22-
const dockerCompose = ["docker-compose", "-f", `${process.env.GITHUB_WORKSPACE}/cache-config/testing/docker/docker-compose.yml`];
22+
const dockerCompose = ["docker", "compose", "-f", `${process.env.GITHUB_WORKSPACE}/cache-config/testing/docker/docker-compose.yml`];
2323

2424
function runProcess(...commandArguments) {
2525
console.info(...commandArguments);

‎.github/actions/health-client-integration-tests/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const spawnOptions = {
1919
stderr: "inherit",
2020
};
2121

22-
const dockerCompose = ["docker-compose", "-f", `${process.env.GITHUB_WORKSPACE}/tc-health-client/testing/docker/docker-compose.yml`];
22+
const dockerCompose = ["docker", "compose", "-f", `${process.env.GITHUB_WORKSPACE}/tc-health-client/testing/docker/docker-compose.yml`];
2323

2424
function runProcess(...commandArguments) {
2525
console.info(...commandArguments);

‎.github/actions/run-ciab/run-ciab.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ set -ex;
2121
store_ciab_logs() {
2222
echo 'Storing CDN-in-a-Box logs...';
2323
mkdir logs;
24-
for service in $($docker_compose ps --services); do
24+
for service in $($docker_compose ps --services --all); do
2525
$docker_compose logs --no-color --timestamps "$service" >"logs/${service}.log";
2626
done;
2727
}
2828

2929
cd infrastructure/cdn-in-a-box;
3030
logged_services='trafficrouter readiness';
3131
other_services='dns edge enroller mid-01 mid-02 origin static trafficmonitor trafficops trafficstats';
32-
docker_compose='docker-compose -f ./docker-compose.yml -f ./docker-compose.readiness.yml';
32+
docker_compose='docker compose -f ./docker-compose.yml -f ./docker-compose.readiness.yml';
3333
$docker_compose up -d $logged_services $other_services;
3434
$docker_compose logs -f $logged_services &
3535

@@ -38,7 +38,7 @@ if ! timeout 12m $docker_compose logs -f readiness >/dev/null; then
3838
echo "CDN-in-a-Box didn't become ready within 12 minutes - exiting" >&2;
3939
exit_code=1;
4040
store_ciab_logs;
41-
elif exit_code="$(docker inspect --format='{{.State.ExitCode}}' "$($docker_compose ps -q readiness)")"; [ "$exit_code" -ne 0 ]; then
41+
elif exit_code="$(docker inspect --format='{{.State.ExitCode}}' "$($docker_compose ps -q --all readiness)")"; [ "$exit_code" -ne 0 ]; then
4242
echo 'Readiness container exited with an error' >&2;
4343
store_ciab_logs;
4444
fi;

‎.github/containers/trafficserver-alpine/Dockerfile‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,36 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
FROM alpine:latest AS build-trafficserver
18+
FROM alpine:3.18 AS build-trafficserver
1919
ARG ATS_VERSION
20-
ADD https://downloads.apache.org/trafficserver/trafficserver-${ATS_VERSION}.tar.bz2 /tmp/
20+
ADD https://archive.apache.org/dist/trafficserver/trafficserver-${ATS_VERSION}.tar.bz2 /tmp/
2121
RUN set -o errexit -o nounset -o xtrace; \
2222
cd tmp; \
2323
dirname=trafficserver-${ATS_VERSION}; \
2424
tar xf ${dirname}.tar.bz2; \
2525
rm ${dirname}.tar.bz2; \
26-
apk add --no-cache \
26+
apk add --update --no-cache \
2727
# configure dependencies
2828
g++ \
2929
perl \
3030
openssl-dev \
3131
pcre-dev \
3232
make \
3333
# build dependencies
34-
libexecinfo-dev \
3534
fortify-headers \
3635
linux-headers \
3736
zlib-dev; \
37+
# Alpine versions above 3.16 do not contain package libexecinfo-dev,
38+
# which ATS needs.
39+
# https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/issues/68#issuecomment-1571877109
40+
apk add --update --no-cache \
41+
--repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main/ \
42+
libexecinfo-dev; \
3843
cd $dirname; \
44+
# Fix is from https://github.com/apache/trafficserver-ingress-controller/pull/151
45+
sed -i 's/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/' \
46+
include/tscore/ink_rwlock.h \
47+
include/tscpp/util/TsSharedMutex.h; \
3948
./configure \
4049
--disable-tests \
4150
--enable-experimental-plugins \
@@ -52,13 +61,18 @@ RUN set -o errexit -o nounset -o xtrace; \
5261
cd ..; \
5362
rm -r $dirname
5463

55-
FROM alpine:latest
64+
FROM alpine:3.18
5665
COPY --from=build-trafficserver /tmp/built/ /
57-
RUN apk add --no-cache \
66+
RUN apk add --update --no-cache \
5867
# runtime dependencies
59-
libexecinfo \
6068
libstdc++ \
6169
pcre && \
70+
# Alpine versions above 3.16 do not contain package libexecinfo,
71+
# which ATS needs.
72+
# https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/issues/68#issuecomment-1571877109
73+
apk add --update --no-cache \
74+
--repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main/ \
75+
libexecinfo && \
6276
adduser -D ats
6377
USER ats
6478
CMD /bin/traffic_server

‎.github/containers/trafficserver-alpine/docker-compose.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
version: '3.9'
1918
services:
2019
trafficserver:
2120
build:
2221
context: .
2322
dockerfile: Dockerfile
2423
args:
2524
ATS_VERSION: ${ATS_VERSION}
26-
# This docker-compose file is no longer used by the container-trafficserver-alpine.yml
25+
# This docker compose file is no longer used by the container-trafficserver-alpine.yml
2726
# Github Actions workflow and is here in case anyone wants to build it manually, since
2827
# the emulated aarch64 GitHub Actions job takes about 3 hours to run.
2928
# To build the trafficserver image for only your computer's own platform, run
30-
# docker-compose build
29+
# docker compose build
3130
#
3231
# To build and push a single image including both linux/amd64 and linux/arm64 platforms, run
3332
# # docker/binfmt writes to /proc/sys/fs/binfmt_misc and its effects are cleared on reboot
@@ -42,4 +41,4 @@ services:
4241
- linux/amd64
4342
- linux/arm64
4443
# for example, ghcr.io/apache/trafficcontrol/ci/trafficserver-alpine:9.1.2
45-
image: ${CONTAINER:-ghcr.io/apache/trafficcontrol/ci/trafficserver-alpine}:${ATS_VERSION}
44+
image: ${CONTAINER:-ghcr.io/${GITHUB_REPOSITORY:-apache/trafficcontrol}/ci/trafficserver-alpine}:${ATS_VERSION}

‎.github/workflows/cache-config-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
env:
8989
ATC_COMPONENT: ${{ github.job }}
9090
- name: Upload RPM
91-
uses: actions/upload-artifact@v2
91+
uses: actions/upload-artifact@v4
9292
with:
9393
name: ${{ github.job }}
9494
path: ${{ github.workspace }}/dist/${{ github.job }}-*.x86_64.rpm
@@ -106,7 +106,7 @@ jobs:
106106
env:
107107
ATC_COMPONENT: ${{ github.job }}
108108
- name: Upload RPM
109-
uses: actions/upload-artifact@v2
109+
uses: actions/upload-artifact@v4
110110
with:
111111
name: ${{ github.job }}
112112
path: ${{ github.workspace }}/dist/trafficcontrol-${{ github.job }}-*.x86_64.rpm
@@ -141,7 +141,7 @@ jobs:
141141
actual_rpm_name="$(ls dist | grep -E '^trafficserver-[0-9.]+-[0-9]+\.[0-9a-f]+.el${{ env.RHEL_VERSION }}.${{ env.TARGET_ARCH }}.rpm$')"
142142
[[ "${{ steps.repo-info.outputs.expected-rpm-name }}" == "$actual_rpm_name" ]]
143143
- name: Upload RPM
144-
uses: actions/upload-artifact@v2
144+
uses: actions/upload-artifact@v4
145145
with:
146146
name: ${{ github.job }}
147147
path: ${{ github.workspace }}/dist/${{ github.job }}-*.x86_64.rpm
@@ -158,21 +158,21 @@ jobs:
158158
- name: Checkout
159159
uses: actions/checkout@master
160160
- name: Download TO RPM
161-
uses: actions/download-artifact@v2
161+
uses: actions/download-artifact@v4
162162
with:
163163
name: traffic_ops
164164
path: ${{ github.workspace }}/cache-config/testing/docker/traffic_ops
165165
- name: Download Cache Config RPM
166-
uses: actions/download-artifact@v2
166+
uses: actions/download-artifact@v4
167167
with:
168168
name: cache-config
169169
path: ${{ github.workspace }}/cache-config/testing/docker/ort_test
170170
- name: Download ATS RPM
171-
uses: actions/download-artifact@v2
171+
uses: actions/download-artifact@v4
172172
with:
173173
name: trafficserver
174174
path: ${{ github.workspace }}/cache-config/testing/docker/yumserver/test-rpms
175175
- name: Build cache config test containers
176-
run: docker-compose -f ${{ github.workspace }}/cache-config/testing/docker/docker-compose.yml build --parallel
176+
run: docker compose -f ${{ github.workspace }}/cache-config/testing/docker/docker-compose.yml build --parallel
177177
- name: Run cache config integration tests
178178
uses: ./.github/actions/cache-config-integration-tests

‎.github/workflows/ciab.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
env:
102102
ATC_COMPONENT: ${{ github.job }}
103103
- name: Upload RPM
104-
uses: actions/upload-artifact@v2
104+
uses: actions/upload-artifact@v4
105105
with:
106106
name: ${{ github.job }}
107107
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -119,7 +119,7 @@ jobs:
119119
env:
120120
ATC_COMPONENT: ${{ github.job }}
121121
- name: Upload RPM
122-
uses: actions/upload-artifact@v2
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: ${{ github.job }}
125125
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -137,7 +137,7 @@ jobs:
137137
env:
138138
ATC_COMPONENT: ${{ github.job }}
139139
- name: Upload RPM
140-
uses: actions/upload-artifact@v2
140+
uses: actions/upload-artifact@v4
141141
with:
142142
name: ${{ github.job }}
143143
path: ${{ github.workspace }}/dist/trafficcontrol-${{ github.job }}-*.rpm
@@ -162,7 +162,7 @@ jobs:
162162
env:
163163
ATC_COMPONENT: ${{ github.job }}
164164
- name: Upload RPM
165-
uses: actions/upload-artifact@v2
165+
uses: actions/upload-artifact@v4
166166
with:
167167
name: ${{ github.job }}
168168
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -185,7 +185,7 @@ jobs:
185185
env:
186186
ATC_COMPONENT: ${{ github.job }}
187187
- name: Upload RPM
188-
uses: actions/upload-artifact@v2
188+
uses: actions/upload-artifact@v4
189189
with:
190190
name: ${{ github.job }}
191191
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -210,7 +210,7 @@ jobs:
210210
env:
211211
ATC_COMPONENT: ${{ github.job }}
212212
- name: Upload RPM
213-
uses: actions/upload-artifact@v2
213+
uses: actions/upload-artifact@v4
214214
with:
215215
name: ${{ github.job }}
216216
path: ${{ github.workspace }}/dist/*.rpm
@@ -228,7 +228,7 @@ jobs:
228228
env:
229229
ATC_COMPONENT: ${{ github.job }}
230230
- name: Upload RPM
231-
uses: actions/upload-artifact@v2
231+
uses: actions/upload-artifact@v4
232232
with:
233233
name: ${{ github.job }}
234234
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -246,7 +246,7 @@ jobs:
246246
env:
247247
ATC_COMPONENT: ${{ github.job }}
248248
- name: Upload RPM
249-
uses: actions/upload-artifact@v2
249+
uses: actions/upload-artifact@v4
250250
with:
251251
name: ${{ github.job }}
252252
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -264,7 +264,7 @@ jobs:
264264
env:
265265
ATC_COMPONENT: ${{ github.job }}
266266
- name: Upload RPM
267-
uses: actions/upload-artifact@v2
267+
uses: actions/upload-artifact@v4
268268
with:
269269
name: ${{ github.job }}
270270
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -282,7 +282,7 @@ jobs:
282282
env:
283283
ATC_COMPONENT: ${{ github.job }}
284284
- name: Upload RPM
285-
uses: actions/upload-artifact@v2
285+
uses: actions/upload-artifact@v4
286286
with:
287287
name: ${{ github.job }}
288288
path: ${{ github.workspace }}/dist/${{ github.job }}-*.rpm
@@ -317,7 +317,7 @@ jobs:
317317
actual_rpm_name="$(ls dist | grep -E '^trafficserver-[0-9.]+-[0-9]+\.[0-9a-f]+.el${{ env.RHEL_VERSION }}.${{ env.TARGET_ARCH }}.rpm$')"
318318
[[ "${{ steps.repo-info.outputs.expected-rpm-name }}" == "$actual_rpm_name" ]]
319319
- name: Upload RPM
320-
uses: actions/upload-artifact@v2
320+
uses: actions/upload-artifact@v4
321321
with:
322322
name: ${{ github.job }}
323323
path: ${{ github.workspace }}/dist/${{ github.job }}-*.x86_64.rpm
@@ -348,15 +348,15 @@ jobs:
348348
- name: Import cached Alpine Docker image
349349
run: .github/actions/save-alpine-tar/entrypoint.sh load ${{ env.ALPINE_VERSION }}
350350
- name: Download RPMs
351-
uses: actions/download-artifact@v2
351+
uses: actions/download-artifact@v4
352352
with:
353353
path: ${{ github.workspace }}/dist/
354354
- name: Build CDN-in-a-Box images
355355
uses: ./.github/actions/build-ciab
356356
- name: Start CDN-in-a-Box
357357
uses: ./.github/actions/run-ciab
358358
- name: Upload CDN-in-a-Box logs
359-
uses: actions/upload-artifact@v2
359+
uses: actions/upload-artifact@v4
360360
with:
361361
name: ciab-logs
362362
path: infrastructure/cdn-in-a-box/logs/*.log

0 commit comments

Comments
 (0)