Skip to content

Commit 4a16099

Browse files
authored
Disable buildkit features (#976)
- Not required for dockerfile rework - Restores prior behavior - Explicitly disable buildkit to avoid pipeline issues
1 parent bfc95c2 commit 4a16099

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

buildspec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ phases:
1111
commands:
1212
# Check latest image versions from dockerhub and from GitHub source file
1313
- './scripts/publish.sh cicd-check-image-version'
14-
# Enable buildkit features
15-
- export DOCKER_BUILDKIT=1
14+
# Disable buildkit features
15+
- export DOCKER_BUILDKIT=0
1616
# Command to build debug image
1717
- make debug
1818
# Command to build your project

scripts/dockerfiles/runtime/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ COPY AWS_FOR_FLUENT_BIT_VERSION /AWS_FOR_FLUENT_BIT_VERSION
4545
ADD ecs /ecs/
4646

4747
# Copy and set up entrypoint script
48-
COPY --chmod=0755 entrypoint.sh /entrypoint.sh
48+
COPY entrypoint.sh /entrypoint.sh
49+
RUN chmod +x /entrypoint.sh
4950

5051
# Optional Metrics endpoint
5152
EXPOSE 2020

scripts/dockerfiles/runtime/Dockerfile.debug-common

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN unzip -o awscliv2.zip
1616
RUN ./aws/install
1717
RUN rm awscliv2.zip
1818

19-
COPY --chmod=0755 ./scripts/core_uploader.sh /
19+
COPY ./scripts/core_uploader.sh /core_uploader.sh
20+
RUN chmod +x /core_uploader.sh
2021

2122
# Run Fluent Bit from the cores-out folder and collect crash symbols
2223
# Move symbols to /cores folder after processing

scripts/dockerfiles/runtime/Dockerfile.init

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ FROM ${RUNTIME_IMAGE}
77
RUN mkdir -p /init
88

99
COPY --from=init /init/fluent_bit_init_process /init/fluent_bit_init_process
10-
COPY --chmod=0755 init/fluent_bit_init_entrypoint.sh /init/fluent_bit_init_entrypoint.sh
10+
COPY init/fluent_bit_init_entrypoint.sh /init/fluent_bit_init_entrypoint.sh
11+
RUN chmod +x /init/fluent_bit_init_entrypoint.sh
1112

1213
# Only last CMD command will be executed, automatically replaces the original entrypoint
1314
CMD /init/fluent_bit_init_entrypoint.sh

0 commit comments

Comments
 (0)