Skip to content

Commit 900fec2

Browse files
authored
YETUS-1255. docker complaining about legacy bits (#350)
Signed-off-by: Nick Dimiduk <[email protected]>
1 parent 6a3e20f commit 900fec2

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

asf-site-src/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}" \
5151
&& useradd -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
5252
# hadolint disable=DL3059,SC2039,SC1117
5353
RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" > "/etc/sudoers.d/yetus-build-${USER_ID}" # pragma: allowlist secret
54-
ENV HOME /home/${USER_NAME}
54+
ENV HOME=/home/${USER_NAME}
5555

5656
WORKDIR /home/${USER_NAME}
5757

58-
ENV APACHE_PID_FILE /tmp/website/pid
59-
ENV APACHE_LOG_DIR /tmp/website/logdir
60-
ENV APACHE_RUN_DIR /tmp/website/rundir
61-
ENV APACHE_RUN_USER ${USER_NAME}
62-
ENV APACHE_RUN_GROUP ${USER_NAME}
58+
ENV APACHE_PID_FILE=/tmp/website/pid
59+
ENV APACHE_LOG_DIR=/tmp/website/logdir
60+
ENV APACHE_RUN_DIR=/tmp/website/rundir
61+
ENV APACHE_RUN_USER=${USER_NAME}
62+
ENV APACHE_RUN_GROUP=${USER_NAME}
6363

6464
# hadolint ignore=DL3013
6565
RUN mkdir -p /tmp/website/{logdir,rundir} \
@@ -74,7 +74,7 @@ USER ${USER_NAME}
7474

7575
RUN bundle config --global github.https true \
7676
&& bundle config --global path "${BUNDLE_PATH}"
77-
ENV GEM_HOME ${BUNDLE_PATH}
77+
ENV GEM_HOME=${BUNDLE_PATH}
7878

7979
# pre-install most of the middleman stack to save time
8080
# on re-launches

precommit/src/main/shell/test-patch-docker/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ FROM ubuntu:jammy AS yetusbase
3030
WORKDIR /root
3131
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3232

33-
ENV DEBIAN_FRONTEND noninteractive
34-
ENV DEBCONF_TERSE true
33+
ENV DEBIAN_FRONTEND=noninteractive
34+
ENV DEBCONF_TERSE=true
3535

3636
######
3737
# Install some basic Apache Yetus requirements
@@ -67,9 +67,9 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
6767
###
6868
#hadolint ignore=DL3059
6969
RUN locale-gen en_US.UTF-8
70-
ENV LANG en_US.UTF-8
71-
ENV LANGUAGE en_US:en
72-
ENV LC_ALL en_US.UTF-8
70+
ENV LANG=en_US.UTF-8
71+
ENV LANGUAGE=en_US:en
72+
ENV LC_ALL=en_US.UTF-8
7373

7474
####
7575
# Install GNU C/C++ and GNU make (everything generally needs this)
@@ -214,7 +214,7 @@ RUN git clone \
214214
#
215215
# NOTE: go must be installed prior to executing this block!
216216
####
217-
FROM yetusbase as yetusgolangci
217+
FROM yetusbase AS yetusgolangci
218218
ARG GOLANGCILINT_VERSION=1.64.4
219219
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
220220
RUN curl -sSL \
@@ -248,8 +248,8 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y default-j
248248
&& apt-get clean \
249249
&& rm -rf /var/lib/apt/lists/*
250250
# this var will get yetus_abs'd when run under precommit so should be relatively safe
251-
ENV JAVA_HOME /usr/lib/jvm/default-java
252-
ENV SPOTBUGS_HOME /opt/spotbugs
251+
ENV JAVA_HOME=/usr/lib/jvm/default-java
252+
ENV SPOTBUGS_HOME=/opt/spotbugs
253253

254254
####
255255
# Install ant
@@ -387,8 +387,8 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc \
387387
&& rm -rf /root/.gem
388388
# set some reasonable defaults for ruby
389389
# user's can always override these as needed
390-
ENV PATH ${PATH}:/var/tmp/.bundler-gems/bin
391-
ENV BUNDLE_PATH /var/tmp/.bundler-gems
390+
ENV PATH=${PATH}:/var/tmp/.bundler-gems/bin
391+
ENV BUNDLE_PATH=/var/tmp/.bundler-gems
392392

393393
###
394394
# Install npm and JSHint

0 commit comments

Comments
 (0)