Skip to content

Commit

Permalink
bug: fix jq url in image (getporter#2853)
Browse files Browse the repository at this point in the history
bug: fix jq url in image

---------

Signed-off-by: Sarah Christoff <[email protected]>
Signed-off-by: Allan Guwatudde <[email protected]>
  • Loading branch information
schristoff authored and Allan Guwatudde committed Aug 9, 2023
1 parent f618dea commit 6feb266
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/integration/build_test.go
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
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}

0 comments on commit 6feb266

Please sign in to comment.