Skip to content

Commit 59ef812

Browse files
committed
node sqlite3 wasn't building correctly on a number of images
Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent eaa79b0 commit 59ef812

20 files changed

+37
-17
lines changed

ci/base-images/opensuse/Dockerfile.python310

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM registry.opensuse.org/opensuse/bci/python:3.10
22

33
ARG GO_VERSION=1.24.3
44

5-
ENV LC_ALL=en_US.UTF-8 \
5+
ENV CC=gcc \
6+
LC_ALL=en_US.UTF-8 \
67
LANG=en_US.UTF-8 \
78
LANGUAGE=en_US.UTF-8 \
89
GOPATH=/opt/app-root/go \

ci/base-images/opensuse/Dockerfile.python39

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.opensuse.org/opensuse/bci/python:3.9
22

3-
ENV LC_ALL=en_US.UTF-8 \
3+
ENV CC=gcc \
4+
LC_ALL=en_US.UTF-8 \
45
LANG=en_US.UTF-8 \
56
LANGUAGE=en_US.UTF-8 \
67
npm_config_python=/usr/bin/python3.9 \
@@ -24,6 +25,7 @@ RUN set -e; \
2425
&& zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends gcc13 gcc13-c++ gcc13-fortran \
2526
python39 python39-devel python39-pip findutils java-24-openjdk-devel \
2627
bzip2 git-core wget zip unzip make gawk nodejs22 npm22 nodejs22-devel libxml2-devel \
28+
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 10 \
2729
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 10 \
2830
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 10 \
2931
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-13 10 \

ci/base-images/opensuse/Dockerfile.rolling

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ ARG GRADLE_VERSION=8.14.1
66
ARG DOTNET_SDK_VERSION=9.0.100
77
ARG SCALA_VERSION=3.6.4
88

9-
ENV SBT_VERSION=$SBT_VERSION \
9+
ENV CC=gcc \
10+
SBT_VERSION=$SBT_VERSION \
1011
MAVEN_VERSION=$MAVEN_VERSION \
1112
GRADLE_VERSION=$GRADLE_VERSION \
1213
DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION \
@@ -45,6 +46,7 @@ RUN set -e; \
4546
&& zypper refresh && zypper --non-interactive dup && zypper --non-interactive install -l --no-recommends gcc14 gcc14-c++ gcc14-fortran \
4647
bzip2 python312 python312-devel python312-pip findutils java-24-openjdk-devel \
4748
libicu-devel git-core wget zip unzip make gawk nodejs22 npm22 rust1.86 cargo1.86 \
49+
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 10 \
4850
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 10 \
4951
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 10 \
5052
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-14 10 \

ci/base-images/sle/Dockerfile.dotnet6

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
55
DOTNET_USE_POLLING_FILE_WATCHER=false \
66
NUGET_XMLDOC_MODE=skip \
77
DOTNET_RUNNING_IN_CONTAINER=true \
8-
DOTNET_CLI_TELEMETRY_OPTOUT=1
8+
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
9+
npm_config_python=/usr/bin/python3.11
910
ENV PATH=${PATH}:/usr/local/bin:
1011

1112
RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 \

ci/base-images/sle/Dockerfile.dotnet7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
55
DOTNET_USE_POLLING_FILE_WATCHER=false \
66
NUGET_XMLDOC_MODE=skip \
77
DOTNET_RUNNING_IN_CONTAINER=true \
8-
DOTNET_CLI_TELEMETRY_OPTOUT=1
8+
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
9+
npm_config_python=/usr/bin/python3.11
910
ENV PATH=${PATH}:/usr/local/bin:
1011

1112
RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk curl \

ci/base-images/sle/Dockerfile.dotnet8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
55
DOTNET_USE_POLLING_FILE_WATCHER=false \
66
NUGET_XMLDOC_MODE=skip \
77
DOTNET_RUNNING_IN_CONTAINER=true \
8-
DOTNET_CLI_TELEMETRY_OPTOUT=1
8+
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
9+
npm_config_python=/usr/bin/python3.11
910

1011
RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk java-21-openjdk-devel \
1112
&& dotnet --list-sdks \

ci/base-images/sle/Dockerfile.dotnet9

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
55
DOTNET_USE_POLLING_FILE_WATCHER=false \
66
NUGET_XMLDOC_MODE=skip \
77
DOTNET_RUNNING_IN_CONTAINER=true \
8-
DOTNET_CLI_TELEMETRY_OPTOUT=1
8+
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
9+
npm_config_python=/usr/bin/python3.11
910

1011
RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk java-21-openjdk-devel \
1112
&& dotnet --list-sdks \

ci/base-images/sle/Dockerfile.java11

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ ENV SBT_VERSION=$SBT_VERSION \
1414
LC_ALL=en_US.UTF-8 \
1515
LANG=en_US.UTF-8 \
1616
LANGUAGE=en_US.UTF-8 \
17-
JAVA_OPTIONS="-Dhttps.protocols=TLSv1.1,TLSv1.2"
17+
JAVA_OPTIONS="-Dhttps.protocols=TLSv1.1,TLSv1.2" \
18+
npm_config_python=/usr/bin/python3.11
1819
ENV PATH=${PATH}:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:
1920

2021
RUN set -e; \

ci/base-images/sle/Dockerfile.java17

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ ENV SBT_VERSION=$SBT_VERSION \
1313
SBT_HOME="/opt/sbt/${SBT_VERSION}" \
1414
LC_ALL=en_US.UTF-8 \
1515
LANG=en_US.UTF-8 \
16-
LANGUAGE=en_US.UTF-8
16+
LANGUAGE=en_US.UTF-8 \
17+
npm_config_python=/usr/bin/python3.11
1718
ENV PATH=${PATH}:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:
1819

1920
RUN set -e; \

ci/base-images/sle/Dockerfile.java17-slim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ ENV SBT_VERSION=$SBT_VERSION \
1313
SBT_HOME="/opt/sbt/${SBT_VERSION}" \
1414
LC_ALL=en_US.UTF-8 \
1515
LANG=en_US.UTF-8 \
16-
LANGUAGE=en_US.UTF-8
16+
LANGUAGE=en_US.UTF-8 \
17+
npm_config_python=/usr/bin/python3.11
1718
ENV PATH=${PATH}:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:
1819

1920
RUN set -e; \

0 commit comments

Comments
 (0)