Skip to content

Commit

Permalink
Merge pull request #533 from ipfs/fix/bump-ipfs-cat-timeout
Browse files Browse the repository at this point in the history
fix(ci): add http retries and bigger timeouts
  • Loading branch information
galargh authored Sep 20, 2023
2 parents f0f5e7f + 481295f commit f486ab6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ ARG KUBO_VER
RUN apt-get update -q && apt-get install -y git curl gnupg jq build-essential gawk zip tzdata && \
ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
dpkg-reconfigure --frontend noninteractive tzdata
RUN curl -s "https://dist.ipfs.tech/kubo/${KUBO_VER}/kubo_${KUBO_VER}_linux-amd64.tar.gz" | tar vzx -C /usr/local/bin/ kubo/ipfs --strip-components=1

RUN curl -sS --retry 5 \
"https://dist.ipfs.tech/kubo/${KUBO_VER}/kubo_${KUBO_VER}_linux-amd64.tar.gz" -o /tmp/kubo.tar.gz && \
tar vzx -f /tmp/kubo.tar.gz -C /usr/local/bin/ kubo/ipfs --strip-components=1

RUN adduser --shell /bin/bash --home /asdf --disabled-password --gecos asdf asdf --uid $USER_UID
ENV PATH="${PATH}:/asdf/.asdf/shims:/asdf/.asdf/bin"
Expand Down
2 changes: 1 addition & 1 deletion deps-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ if [ "$failed" = true ]; then
exit 1
fi

echo "npm install"
echo "Starting npm ci (deterministic install)"
exec npm ci --prefer-offline --no-audit --progress=false
2 changes: 1 addition & 1 deletion scripts/dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const HUGO_DATA_DIR = join(__dirname, '..', 'site', 'data')
const DIST_PATH = join(__dirname, '..', 'dists')
const DIST_ROOT = process.env.DIST_ROOT || '/ipns/dist.ipfs.tech'

const ipfs = IpfsHttpClient()
const ipfs = IpfsHttpClient({ timeout: '45m' })

async function getCurrentVersion (distName) {
const pathToCurrent = join(DIST_PATH, distName, 'current')
Expand Down
2 changes: 1 addition & 1 deletion scripts/patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const IpfsHttpClient = require('ipfs-http-client')
const { globSource } = IpfsHttpClient
require('make-promises-safe') // exit on error

const ipfs = IpfsHttpClient()
const ipfs = IpfsHttpClient({ timeout: '45m' })
const pathTo = (file) => path.join(__dirname, '..', file)

const event = new Date()
Expand Down

0 comments on commit f486ab6

Please sign in to comment.