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

Jump to bottom

bug: fix jq url in image #2853

Merged
merged 5 commits into from
Aug 3, 2023
Merged

bug: fix jq url in image #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e65aec
:shrug-emoji:
schristoff Aug 1, 2023
46b0609
g is not q lol
schristoff Aug 1, 2023
167214f
okay test locally this time
schristoff Aug 2, 2023
f3bbea9
this took way too long
schristoff Aug 2, 2023
cc9095e
Anything we do 10 times per integration is gonna give us headaches. B…
schristoff Aug 3, 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
2 changes: 1 addition & 1 deletion tests/integration/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestRebuild(t *testing.T) {
// Explain the bundle a bunch more times, it should not rebuild again.
// This is a regression test for a bug where the manifest would be considered out-of-date when nothing had changed
// caused by us using a go map when comparing the mixins used in the bundle, which has inconsistent sort order...
for i := 0; i < 10; i++ {
for i := 0; i < 5; i++ {
_, output = test.RequirePorter("explain")
tests.RequireOutputContains(t, output, "Bundle is up-to-date!", "expected the previous build to be reused")
}
Expand Down
9 changes: 5 additions & 4 deletions tests/integration/testdata/bundles/exec-outputs/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ ARG BUNDLE_DIR
RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install gnupg2 -y
ENV JQ_VERSION='1.6'
RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key -O /tmp/jq-release.key && \
wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \
wget --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \

RUN wget --no-check-certificate https://raw.githubusercontent.com/jqlang/jq/master/sig/jq-release-old.key -O /tmp/jq-release.key && \
wget --no-check-certificate https://raw.githubusercontent.com/jqlang/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \
wget --no-check-certificate https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \
gpg --import /tmp/jq-release.key && \
gpg --verify /tmp/jq-linux64.asc /tmp/jq-linux64 && \
cp /tmp/jq-linux64 /usr/bin/jq && \
Expand All @@ -19,4 +20,4 @@ RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/ma
rm -f /tmp/jq-linux64

# Use the BUNDLE_DIR build argument to copy files into the bundle
COPY . ${BUNDLE_DIR}
COPY . ${BUNDLE_DIR}