Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ansible: upgrade armv7l containers to Debian 11 #3582

Merged
merged 1 commit into from
Dec 7, 2023
Merged

ansible: upgrade armv7l containers to Debian 11 #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...r/templates/debian10_armv7l.Dockerfile.j2 → ...r/templates/debian11_armv7l.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm32v7/debian:10
FROM arm32v7/debian:11

ENV LC_ALL C
ENV USER {{ server_user }}
Expand All @@ -16,11 +16,11 @@ ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
curl \
g++-8 \
gcc-8 \
g++-10 \
gcc-10 \
git \
libfontconfig1 \
openjdk-11-jre-headless \
openjdk-17-jre-headless \
pkg-config \
procps \
python3-pip \
Expand Down
1 change: 0 additions & 1 deletion jenkins/scripts/VersionSelectorScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def buildExclusions = [
[ /^centos7-ppcle/, anyType, gte(18) ],

// ARM --------------------------------------------------
[ /^debian10-armv7l$/, anyType, gte(20) ], // gcc 10 requires newer libstdc++
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-4.9/, anyType, gte(16) ],
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/, anyType, gte(16) ],
[ /^cross-compiler-ubuntu1804-armv7-gcc-6/, anyType, gte(16) ],
Expand Down