docker: Use pre-built curl-impersonate library from github releases #3984
Conversation
Dockerfile
Outdated
| && mkdir -p /usr/local/lib/curl-impersonate \ | ||
| && tar xaf "$archive" -C /usr/local/lib/curl-impersonate --wildcards 'libcurl-impersonate-ff.so*' \ | ||
| && rm "$archive" \ | ||
| && apt-get purge --assume-yes curl |
There was a problem hiding this comment.
| && apt-get purge --assume-yes curl | |
| && apt-get purge --assume-yes curl \ | |
| && rm -rf /var/lib/apt/lists/* |
Clean Apt cache
There was a problem hiding this comment.
Maybe consider moving all this section up to line 25 to avoid having to do an apt update again.
There was a problem hiding this comment.
Yes, makes sense. I'll update the PR.
Dockerfile
Outdated
| && sha512sum="d04b1eabe71f3af06aa1ce99b39a49c5e1d33b636acedcd9fad163bc58156af5c3eb3f75aa706f335515791f7b9c7a6c40ffdfa47430796483ecef929abd905d" \ | ||
| ; } \ | ||
| || { \ | ||
| [ $(arch) = 'armv7l' ] \ |
There was a problem hiding this comment.
I am not sure: would this binary also work on arm64 (e.g. in the case of Raspberry Pi)?
There was a problem hiding this comment.
I'm not sure what you mean. armv7l is arm32 / aarch32 and arm64 is aarch64. Actually, I run rss-bridge on a raspberry pi 4 and use the aarch64 library of curl-impersonate.
There was a problem hiding this comment.
My bad, aarch64 is already in the list. My question was whether some of those strings were too specific and could also work for other values. For instance (I am not sure): armv8l vs. aarch64
There was a problem hiding this comment.
Might not be important for now, though
There was a problem hiding this comment.
The rss-bridge image is available for architectures:
linux/amd64=x86_64linux/arm/v7=armv7llinux/arm64=aarch64
For new architectures, the build step will fail and an existing condition must be adjusted (if applicable) or a new condition must be added.
The docker image is only available for `amd64` architecture and therefore cannot be used for arm images. Fixes #3983
| ENV LD_PRELOAD /usr/local/lib/curl-impersonate/libcurl-impersonate-ff.so | ||
| ENV CURL_IMPERSONATE ff91esr |
There was a problem hiding this comment.
Maybe there should the be a fall-back case to not using CURL_IMPERSONATE if we have not found any pre-compiled version of it higher up for the current architecture.
And maybe together with an echo "No libcurl-impersonate found for current architecture $(arch)"
There was a problem hiding this comment.
I would not make the Dockerfile more complex than needed. For now, all architectures for which the rss-bridge image is available (see #3984 (comment)), are covered.
For unsupported architectures, the docker build step will fail and no image is created. In this case, the Dockerfile needs to be adjusted to support the new architecture.
|
i really dont want to acquire more docker skills. shall i merge this now? |
Checked to work on |
The docker image is only available for
amd64architecture and therefore cannot be used for arm images.Fixes #3983