Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure build fails if image build fails #642

Merged
merged 6 commits into from
Oct 19, 2023
Merged

Make sure build fails if image build fails #642

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02e44d9
build validation fixes
gracewehner Oct 18, 2023
2891b01
include -y for tdnf update
gracewehner Oct 18, 2023
0146f1d
change deploy to dev clusters dependencies
gracewehner Oct 19, 2023
fab6ac1
add telegraf cve
gracewehner Oct 19, 2023
4cb17c4
Merge remote-tracking branch 'origin' into grace/build-fix
gracewehner Oct 19, 2023
d77a576
fix merge
gracewehner Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .pipelines/azure-pipeline-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,19 @@ jobs:
# Load in amd64 image to run vulnerability scan
docker buildx build . --file ./build/linux/Dockerfile -t $(LINUX_FULL_IMAGE_NAME) --metadata-file $(Build.ArtifactStagingDirectory)/linux/metadata.json
fi
workingDirectory: $(Build.SourcesDirectory)/otelcollector/
displayName: "Build: build and push image to dev ACR"

- bash: |
MEDIA_TYPE=$(docker manifest inspect -v $(LINUX_FULL_IMAGE_NAME) | jq '.Descriptor.mediaType')
DIGEST=$(docker manifest inspect -v $(LINUX_FULL_IMAGE_NAME) | jq '.Descriptor.digest')
SIZE=$(docker manifest inspect -v $(LINUX_FULL_IMAGE_NAME) | jq '.Descriptor.size')
cat <<EOF >>$(Build.ArtifactStagingDirectory)/linux/payload.json
{"targetArtifact":{"mediaType":$MEDIA_TYPE,"digest":$DIGEST,"size":$SIZE}}
EOF
workingDirectory: $(Build.SourcesDirectory)/otelcollector/
displayName: "Build: build and push image to dev ACR"
displayName: "Build: Set values in payload.json for signing"
condition: eq(variables.IS_MAIN_BRANCH, true)

- task: EsrpCodeSigning@3
displayName: "ESRP CodeSigning for Prometheus"
Expand Down
2 changes: 1 addition & 1 deletion otelcollector/build/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ COPY ./build/linux/rpm-repos/ /etc/yum.repos.d/
ARG TARGETARCH
RUN tdnf clean all
RUN tdnf repolist --refresh
RUN tdnf update
RUN tdnf update -y
RUN tdnf install -y wget sudo net-tools cronie vim ruby-devel logrotate procps-ng busybox diffutils curl
RUN mkdir /busybin && busybox --install /busybin
RUN chmod 775 /etc/cron.daily/logrotate
Expand Down
Loading