Skip to content

Commit

Permalink
Update alpine Docker tag to v3.19 (#116)
Browse files Browse the repository at this point in the history
* Update alpine Docker tag to v3.19

* Set break-system-packages system-wide

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Atsushi Watanabe <atsushi.w@ieee.org>
  • Loading branch information
renovate[bot] and at-wat committed Mar 29, 2024
1 parent bf31d8b commit 76d02ff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_VERSION=3.18
ARG ALPINE_VERSION=3.19
ARG GOLANG_VERSION=1.22

# ===========================
Expand Down Expand Up @@ -250,6 +250,8 @@ RUN apk add \
&& find /usr -name "*.pyc" -delete \
&& find /usr -name "__pycache__" -delete

RUN echo -e "[global]\nbreak-system-packages = true" >> /etc/pip.conf

ARG S6_OVERLAY_VERSION=2.1.0.2
RUN wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz \
&& tar xzf /s6-overlay-amd64.tar.gz \
Expand Down Expand Up @@ -340,7 +342,6 @@ RUN apk add --virtual .build-deps \
sed "/\"$d=/di" -i datadog_checks_base/pyproject.toml; \
done \
&& python3 -m pip install \
--break-system-packages \
"./datadog_checks_base[deps, http]" \
$(echo ${INTEGRATIONS_CORE} | xargs -n1 echo | sed 's|^|./|') \
&& apk del --force-broken-world .build-deps \
Expand Down
2 changes: 1 addition & 1 deletion integrations-builder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN git clone --depth=1 https://github.com/DataDog/integrations-core.git /tmp/in
&& git checkout refs/tags/${DATADOG_INTEGRATIONS_CORE_VERSION} \
&& version() { apk info $1 2> /dev/null | sed -n 's/\S\+-\([0-9\.]\+\)-r[0-9]\+ description:/\1/p'; } \
&& . ${HOME}/.cargo/env \
&& python3 -m pip install --break-system-packages \
&& python3 -m pip install \
aiohttp==$(version py3-aiohttp) \
bcrypt==$(version py3-bcrypt) \
cryptography==$(version py3-cryptography) \
Expand Down

0 comments on commit 76d02ff

Please sign in to comment.