Skip to content

Commit af7655d

Browse files
authored
Merge branch 'main' into fix_wf_step_name
2 parents 5eb1cc1 + e4f5b28 commit af7655d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/main_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- main
77
- "release/v*"
8-
- e2e-parallel
98
env:
109
AWS_DEFAULT_REGION: us-east-1
1110
STAGING_ECR_REGISTRY: 637423224110.dkr.ecr.us-east-1.amazonaws.com

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# update the `PYTHONPATH` environment variable accordingly. Then in the second stage, copy the directory to `/autoinstrumentation`.
66

77
# Stage 1: Install ADOT Python in the /operator-build folder
8-
FROM python:3.11 AS build
8+
FROM public.ecr.aws/docker/library/python:3.11 AS build
99

1010
WORKDIR /operator-build
1111

@@ -21,7 +21,7 @@ RUN sed -i "/opentelemetry-exporter-otlp-proto-grpc/d" ./aws-opentelemetry-distr
2121
RUN mkdir workspace && pip install --target workspace ./aws-opentelemetry-distro
2222

2323
# Stage 2: Build the cp-utility binary
24-
FROM rust:1.75 as builder
24+
FROM public.ecr.aws/docker/library/rust:1.75 as builder
2525

2626
WORKDIR /usr/src/cp-utility
2727
COPY ./tools/cp-utility .

0 commit comments

Comments
 (0)