Skip to content

Commit cb40b23

Browse files
authored
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 #2330. Since `hadolint/hadolint-action@v3.1.0` 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.
1 parent cc5e9c7 commit cb40b23

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/standardization_lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- uses: actions/checkout@v4
58-
- uses: hadolint/hadolint-action@v3.1.0
58+
- uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
5959
with:
6060
recursive: true
6161
ignore: 'DL3033,DL3013,DL3059,SC2086,DL3003,SC2164,DL3008,DL3007,DL3006,DL4001,DL3041'

.licenserc.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ header:
4848
- 'go-client/idl/radmin/**'
4949
- 'go-client/idl/replication/**'
5050
- 'go-client/idl/rrdb/**'
51+
- 'go-client/idl/utils/**'
5152
# Special files for nodejs.
5253
- '**/.npmigonre'
5354
# Special files for python.
@@ -68,12 +69,14 @@ header:
6869
- 'src/replica/duplication/test/log.1.0.handle_real_private_log2'
6970
- 'src/replica/duplication/test/log.1.0.all_loaded_are_write_empties'
7071
# Used for patches for thirdparties.
72+
- 'thirdparty/fix_absl_build_on_macos_arm64.patch'
7173
- 'thirdparty/fix_hdfs_native_client.patch'
7274
- 'thirdparty/fix_jemalloc_for_m1_on_macos.patch'
7375
- 'thirdparty/fix_libevent_for_macos.patch'
7476
- 'thirdparty/fix_rocksdb-cmake-PORTABLE-option.patch'
75-
- 'thirdparty/fix_snappy-Wsign-compare-warning.patch'
77+
- 'thirdparty/fix_rocksdb-plugin-hdfs.patch'
7678
- 'thirdparty/fix_s2_build_with_absl_and_gtest.patch'
79+
- 'thirdparty/fix_snappy-Wsign-compare-warning.patch'
7780
- 'thirdparty/fix_thrift_build_and_link_errors.patch'
7881
# TODO(yingchun): shell/* files are import from thirdparties, we can move them to thirdparty later.
7982
# Copyright (c) 2016, Adi Shavit

docker/pegasus-build-env/ubuntu2004/Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,17 @@ RUN wget --progress=dot:giga https://archive.apache.org/dist/thrift/0.11.0/thrif
7070
ENV OPENSSL_VERSION="3.0.12"
7171
ENV OPENSSL_INSTALL_DIR="/usr/local/ssl"
7272

73-
RUN wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz -P /opt/openssl\
74-
&& cd /opt/openssl \ && tar -xzvf openssl-$OPENSSL_VERSION.tar.gz \
75-
&& cd openssl-$OPENSSL_VERSION \
76-
&& ./config shared --prefix=$OPENSSL_INSTALL_DIR \
77-
&& make -j$(nproc) \
78-
&& make install \
79-
&& ln -sf $OPENSSL_INSTALL_DIR/bin/openssl /usr/bin/openssl \
80-
&& ln -sf $OPENSSL_INSTALL_DIR/include/openssl /usr/local/include/openssl \
81-
&& echo "$OPENSSL_INSTALL_DIR/lib64" | tee /etc/ld.so.conf.d/openssl-3.0.conf \
82-
&& ldconfig -v
73+
RUN wget --progress=dot:giga https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -P /opt/openssl && \
74+
cd /opt/openssl && \
75+
tar -xzvf "openssl-${OPENSSL_VERSION}.tar.gz" && \
76+
cd "openssl-${OPENSSL_VERSION}" && \
77+
./config shared --prefix="${OPENSSL_INSTALL_DIR}" && \
78+
make -j"$(nproc)" && \
79+
make install && \
80+
ln -sf "${OPENSSL_INSTALL_DIR}/bin/openssl" /usr/bin/openssl && \
81+
ln -sf "${OPENSSL_INSTALL_DIR}/include/openssl" /usr/local/include/openssl && \
82+
echo "${OPENSSL_INSTALL_DIR}/lib64" > /etc/ld.so.conf.d/openssl-3.0.conf && \
83+
ldconfig -v
8384

8485
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
8586
ENV CLASSPATH=$JAVA_HOME/lib/

0 commit comments

Comments
 (0)