This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new 259316348 Fix `docker-test` for the 1.11.x branch (#3099)
259316348 is described below
commit 2593163483c39d16a2616b43ef7d705aefe32a05
Author: Fokko Driesprong <[email protected]>
AuthorDate: Fri Aug 16 14:35:59 2024 +0200
Fix `docker-test` for the 1.11.x branch (#3099)
---
.github/workflows/test-docker.yml | 39 +++++++++++++++++++++++++++++++++++++++
lang/js/package-lock.json | 16 ++++++++--------
share/docker/Dockerfile | 30 ++++++++++++------------------
3 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/test-docker.yml
b/.github/workflows/test-docker.yml
new file mode 100644
index 000000000..70f8f247f
--- /dev/null
+++ b/.github/workflows/test-docker.yml
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 'Docker tests'
+on:
+ workflow_dispatch:
+ push:
+ branches: [ branch-1.11 ]
+ pull_request:
+ branches: [ branch-1.11 ]
+ paths:
+ - 'share/docker/*'
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Run Docker tests
+ shell: bash
+ run: ./build.sh docker-test
+
diff --git a/lang/js/package-lock.json b/lang/js/package-lock.json
index 56fec018c..cb61de31f 100644
--- a/lang/js/package-lock.json
+++ b/lang/js/package-lock.json
@@ -652,7 +652,7 @@
"archy": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz";,
- "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+ "integrity":
"sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
"dev": true
},
"argparse": {
@@ -877,7 +877,7 @@
"commondir": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";,
- "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+ "integrity":
"sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
"dev": true
},
"concat-map": {
@@ -1352,7 +1352,7 @@
"imurmurhash": {
"version": "0.1.4",
"resolved":
"https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";,
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+ "integrity":
"sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
"dev": true
},
"indent-string": {
@@ -1452,7 +1452,7 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";,
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "integrity":
"sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true
},
"isstream": {
@@ -1671,7 +1671,7 @@
"lodash.flattendeep": {
"version": "4.4.0",
"resolved":
"https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz";,
- "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+ "integrity":
"sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
"dev": true
},
"log-driver": {
@@ -2216,7 +2216,7 @@
"release-zalgo": {
"version": "1.0.0",
"resolved":
"https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz";,
- "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
+ "integrity":
"sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
"dev": true,
"requires": {
"es6-error": "^4.0.1"
@@ -2323,7 +2323,7 @@
"set-blocking": {
"version": "2.0.0",
"resolved":
"https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";,
- "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+ "integrity":
"sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
"dev": true
},
"shebang-command": {
@@ -2478,7 +2478,7 @@
"to-fast-properties": {
"version": "2.0.0",
"resolved":
"https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";,
- "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "integrity":
"sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
"dev": true
},
"to-regex-range": {
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 81584b5f8..c1c2565e5 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -175,12 +175,14 @@ RUN python3 -m pip install --upgrade pip setuptools wheel
\
&& python3 -m pip install tox zstandard
# Install .NET SDK
-RUN wget
https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
-O packages-microsoft-prod.deb \
- && dpkg -i packages-microsoft-prod.deb \
- && rm packages-microsoft-prod.deb \
- && apt-get update \
- && apt-get -qqy install --no-install-recommends dotnet-sdk-3.1 dotnet-sdk-5.0
dotnet-sdk-6.0 dotnet-sdk-7.0 \
- && apt-get -qqy clean
+RUN cd /opt ; \
+ wget https://dot.net/v1/dotnet-install.sh ; \
+ bash ./dotnet-install.sh --channel "3.1" --install-dir "/opt/dotnet" ; \
+ bash ./dotnet-install.sh --channel "5.0" --install-dir "/opt/dotnet" ; \
+ bash ./dotnet-install.sh --channel "6.0" --install-dir "/opt/dotnet" ; \
+ bash ./dotnet-install.sh --channel "7.0" --install-dir "/opt/dotnet" ;
+
+ENV PATH $PATH:/opt/dotnet
# Install Ruby
RUN apt-get -qqy install ruby-full \
@@ -193,17 +195,9 @@ RUN gem install bundler -v 2.4.22 --no-document && \
cd /tmp/lang/ruby && bundle install
# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
--default-toolchain 1.73.0
-
-# Note: This "ubertool" container has two JDK versions:
-# - OpenJDK 8
-# - OpenJDK 11
-# - OpenJDK 17
-# - The root build.sh script switches between the versions according to
-# the JAVA environment variable.
-
-# Since we want the JDK8 as a default, we have to re-prepend it to the PATH.
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
-ENV PATH $JAVA_HOME/bin:$PATH
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
--default-toolchain 1.74.0
+ENV PATH $PATH:/root/.cargo/bin/
+
+RUN update-java-alternatives -s "java-1.8.*"
CMD ["/bin/bash", "-i"]
