Skip to content

Commit

Permalink
Remove deb 11 u4 version exclusions
Browse files Browse the repository at this point in the history
  • Loading branch information
pazone committed Jul 3, 2024
1 parent 9948788 commit 172f427
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 1 addition & 5 deletions go/arm/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ RUN apt install -y \
RUN apt install -y \
librpm-dev:arm64

# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
# See https://github.com/elastic/golang-crossbuild/pull/316
RUN apt install -y \
libsystemd-dev:arm64
{{- end }}
Expand Down Expand Up @@ -88,10 +86,8 @@ RUN apt install -y \
RUN apt install -y \
librpm-dev

# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
# See https://github.com/elastic/golang-crossbuild/pull/316
RUN apt install -y \
libsystemd-dev{{- if eq .DEBIAN_VERSION "11"}}=247.3-7+deb11u4{{- end }}
libsystemd-dev
{{- end }}

# Declare TARGETARCH to make it available
Expand Down
4 changes: 1 addition & 3 deletions go/main/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ RUN apt install -y --no-install-recommends --allow-unauthenticated\
libxml2-dev \
libsqlite3-dev

# For Debian 11 libsystemd-dev must be 247.3-7+deb11u4 because of preinstalled libsystemd0:247.3-7+deb11u4
# See https://github.com/elastic/golang-crossbuild/pull/316
RUN apt install -y --no-install-recommends --allow-unauthenticated\
libsystemd-dev{{- if eq .DEBIAN_VERSION "11" }}=247.3-7+deb11u4{{- end }}
libsystemd-dev
{{- end }}

{{- if or (eq .DEBIAN_VERSION "9") (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}
Expand Down

0 comments on commit 172f427

Please sign in to comment.