This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new 900fec2d YETUS-1255. docker complaining about legacy bits (#350)
900fec2d is described below
commit 900fec2d425c1f4d91f9d1711f043509832abb3d
Author: Allen Wittenauer <[email protected]>
AuthorDate: Sat Jul 12 10:46:07 2025 -0700
YETUS-1255. docker complaining about legacy bits (#350)
Signed-off-by: Nick Dimiduk <[email protected]>
---
asf-site-src/Dockerfile | 14 +++++++-------
.../src/main/shell/test-patch-docker/Dockerfile | 20 ++++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/asf-site-src/Dockerfile b/asf-site-src/Dockerfile
index b5016669..4ce8a400 100644
--- a/asf-site-src/Dockerfile
+++ b/asf-site-src/Dockerfile
@@ -51,15 +51,15 @@ RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}" \
&& useradd -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
# hadolint disable=DL3059,SC2039,SC1117
RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" >
"/etc/sudoers.d/yetus-build-${USER_ID}" # pragma: allowlist secret
-ENV HOME /home/${USER_NAME}
+ENV HOME=/home/${USER_NAME}
WORKDIR /home/${USER_NAME}
-ENV APACHE_PID_FILE /tmp/website/pid
-ENV APACHE_LOG_DIR /tmp/website/logdir
-ENV APACHE_RUN_DIR /tmp/website/rundir
-ENV APACHE_RUN_USER ${USER_NAME}
-ENV APACHE_RUN_GROUP ${USER_NAME}
+ENV APACHE_PID_FILE=/tmp/website/pid
+ENV APACHE_LOG_DIR=/tmp/website/logdir
+ENV APACHE_RUN_DIR=/tmp/website/rundir
+ENV APACHE_RUN_USER=${USER_NAME}
+ENV APACHE_RUN_GROUP=${USER_NAME}
# hadolint ignore=DL3013
RUN mkdir -p /tmp/website/{logdir,rundir} \
@@ -74,7 +74,7 @@ USER ${USER_NAME}
RUN bundle config --global github.https true \
&& bundle config --global path "${BUNDLE_PATH}"
-ENV GEM_HOME ${BUNDLE_PATH}
+ENV GEM_HOME=${BUNDLE_PATH}
# pre-install most of the middleman stack to save time
# on re-launches
diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile
b/precommit/src/main/shell/test-patch-docker/Dockerfile
index 858b8bdd..97d87df0 100644
--- a/precommit/src/main/shell/test-patch-docker/Dockerfile
+++ b/precommit/src/main/shell/test-patch-docker/Dockerfile
@@ -30,8 +30,8 @@ FROM ubuntu:jammy AS yetusbase
WORKDIR /root
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_TERSE true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_TERSE=true
######
# Install some basic Apache Yetus requirements
@@ -67,9 +67,9 @@ RUN apt-get -q update && apt-get -q install
--no-install-recommends -y \
###
#hadolint ignore=DL3059
RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
####
# Install GNU C/C++ and GNU make (everything generally needs this)
@@ -214,7 +214,7 @@ RUN git clone \
#
# NOTE: go must be installed prior to executing this block!
####
-FROM yetusbase as yetusgolangci
+FROM yetusbase AS yetusgolangci
ARG GOLANGCILINT_VERSION=1.64.4
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sSL \
@@ -248,8 +248,8 @@ RUN apt-get -q update && apt-get -q install
--no-install-recommends -y default-j
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# this var will get yetus_abs'd when run under precommit so should be
relatively safe
-ENV JAVA_HOME /usr/lib/jvm/default-java
-ENV SPOTBUGS_HOME /opt/spotbugs
+ENV JAVA_HOME=/usr/lib/jvm/default-java
+ENV SPOTBUGS_HOME=/opt/spotbugs
####
# Install ant
@@ -387,8 +387,8 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc \
&& rm -rf /root/.gem
# set some reasonable defaults for ruby
# user's can always override these as needed
-ENV PATH ${PATH}:/var/tmp/.bundler-gems/bin
-ENV BUNDLE_PATH /var/tmp/.bundler-gems
+ENV PATH=${PATH}:/var/tmp/.bundler-gems/bin
+ENV BUNDLE_PATH=/var/tmp/.bundler-gems
###
# Install npm and JSHint
