This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new cb40b233b ci(github): bump hadolint/hadolint-action from 3.1.0 to
3.3.0 and fix Dockerfile and license issues reported by lint checks (#2331)
cb40b233b is described below
commit cb40b233bc5c4a9b2193bc7320f857f7c57ac278
Author: Dan Wang <[email protected]>
AuthorDate: Thu Mar 5 19:01:10 2026 +0800
ci(github): bump hadolint/hadolint-action from 3.1.0 to 3.3.0 and fix
Dockerfile and license issues reported by lint checks (#2331)
Resolve https://github.com/apache/incubator-pegasus/issues/2330.
Since `hadolint/[email protected]` is no longer in the allow list,
Dockerfile
linting could not run. Therefore, `hadolint-action` needs to be pinned to
the
commit SHA of version 3.3.0.
After `hadolint-action` has been successfully re-enabled, this PR fixes the
issues reported by lint in the Ubuntu 20.04 image Dockerfile as well as in
the
license file.
---
.github/workflows/standardization_lint.yaml | 2 +-
.licenserc.yaml | 5 ++++-
docker/pegasus-build-env/ubuntu2004/Dockerfile | 21 +++++++++++----------
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/standardization_lint.yaml
b/.github/workflows/standardization_lint.yaml
index e299baedb..4fe09d279 100644
--- a/.github/workflows/standardization_lint.yaml
+++ b/.github/workflows/standardization_lint.yaml
@@ -55,7 +55,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: hadolint/[email protected]
+ - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
with:
recursive: true
ignore:
'DL3033,DL3013,DL3059,SC2086,DL3003,SC2164,DL3008,DL3007,DL3006,DL4001,DL3041'
diff --git a/.licenserc.yaml b/.licenserc.yaml
index fdbd33004..5ee0e2ad1 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -48,6 +48,7 @@ header:
- 'go-client/idl/radmin/**'
- 'go-client/idl/replication/**'
- 'go-client/idl/rrdb/**'
+ - 'go-client/idl/utils/**'
# Special files for nodejs.
- '**/.npmigonre'
# Special files for python.
@@ -68,12 +69,14 @@ header:
- 'src/replica/duplication/test/log.1.0.handle_real_private_log2'
- 'src/replica/duplication/test/log.1.0.all_loaded_are_write_empties'
# Used for patches for thirdparties.
+ - 'thirdparty/fix_absl_build_on_macos_arm64.patch'
- 'thirdparty/fix_hdfs_native_client.patch'
- 'thirdparty/fix_jemalloc_for_m1_on_macos.patch'
- 'thirdparty/fix_libevent_for_macos.patch'
- 'thirdparty/fix_rocksdb-cmake-PORTABLE-option.patch'
- - 'thirdparty/fix_snappy-Wsign-compare-warning.patch'
+ - 'thirdparty/fix_rocksdb-plugin-hdfs.patch'
- 'thirdparty/fix_s2_build_with_absl_and_gtest.patch'
+ - 'thirdparty/fix_snappy-Wsign-compare-warning.patch'
- 'thirdparty/fix_thrift_build_and_link_errors.patch'
# TODO(yingchun): shell/* files are import from thirdparties, we can move
them to thirdparty later.
# Copyright (c) 2016, Adi Shavit
diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile
b/docker/pegasus-build-env/ubuntu2004/Dockerfile
index c88450715..e696b0ac5 100644
--- a/docker/pegasus-build-env/ubuntu2004/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu2004/Dockerfile
@@ -70,16 +70,17 @@ RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrif
ENV OPENSSL_VERSION="3.0.12"
ENV OPENSSL_INSTALL_DIR="/usr/local/ssl"
-RUN wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz -P
/opt/openssl\
- && cd /opt/openssl \ && tar -xzvf openssl-$OPENSSL_VERSION.tar.gz \
- && cd openssl-$OPENSSL_VERSION \
- && ./config shared --prefix=$OPENSSL_INSTALL_DIR \
- && make -j$(nproc) \
- && make install \
- && ln -sf $OPENSSL_INSTALL_DIR/bin/openssl /usr/bin/openssl \
- && ln -sf $OPENSSL_INSTALL_DIR/include/openssl /usr/local/include/openssl \
- && echo "$OPENSSL_INSTALL_DIR/lib64" | tee
/etc/ld.so.conf.d/openssl-3.0.conf \
- && ldconfig -v
+RUN wget --progress=dot:giga
https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -P
/opt/openssl && \
+ cd /opt/openssl && \
+ tar -xzvf "openssl-${OPENSSL_VERSION}.tar.gz" && \
+ cd "openssl-${OPENSSL_VERSION}" && \
+ ./config shared --prefix="${OPENSSL_INSTALL_DIR}" && \
+ make -j"$(nproc)" && \
+ make install && \
+ ln -sf "${OPENSSL_INSTALL_DIR}/bin/openssl" /usr/bin/openssl && \
+ ln -sf "${OPENSSL_INSTALL_DIR}/include/openssl" /usr/local/include/openssl
&& \
+ echo "${OPENSSL_INSTALL_DIR}/lib64" > /etc/ld.so.conf.d/openssl-3.0.conf
&& \
+ ldconfig -v
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ENV CLASSPATH=$JAVA_HOME/lib/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
