Skip to content

Commit c81e5ff

Browse files
authored
chore: formatting - verify the e2e runner builder action works (and also make the dockerfile more consistently formatted with lines ENDING with \&\& instead of starting with that (#2554)
Signed-off-by: Nick Boldt <[email protected]>
1 parent 0427e25 commit c81e5ff

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.ibm/images/Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ COPY .yarnrc.yml /root/.yarnrc.yml
2222
RUN rm -f $(which yarn) || true
2323

2424
# Extract the correct version from the file and install
25-
RUN YARN_VERSION=$(awk -F'[-.]' '/yarnPath:/ {print $(NF-3)"."$(NF-2)"."$(NF-1)}' /root/.yarnrc.yml) \
26-
&& echo "Detected Yarn Version: $YARN_VERSION" \
27-
&& corepack enable \
28-
&& corepack prepare "yarn@$YARN_VERSION" --activate \
29-
&& yarn -v \
30-
&& rm -f /root/.yarnrc.yml \
31-
&& echo "export PATH=\"\$HOME/.yarn/bin:\$HOME/.config/yarn/global/node_modules/.bin:\$PATH\"" >> /root/.bashrc \
32-
&& echo 'echo "Yarn version: $(yarn -v)"' >> /root/.bashrc
25+
RUN YARN_VERSION=$(awk -F'[-.]' '/yarnPath:/ {print $(NF-3)"."$(NF-2)"."$(NF-1)}' /root/.yarnrc.yml) && \
26+
echo "Detected Yarn Version: $YARN_VERSION" && \
27+
corepack enable && \
28+
corepack prepare "yarn@$YARN_VERSION" --activate && \
29+
yarn -v && \
30+
rm -f /root/.yarnrc.yml && \
31+
echo "export PATH=\"\$HOME/.yarn/bin:\$HOME/.config/yarn/global/node_modules/.bin:\$PATH\"" >> /root/.bashrc && \
32+
echo 'echo "Yarn version: $(yarn -v)"' >> /root/.bashrc
3333

3434
# Install essential dependencies and Node.js tools
3535
RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -43,13 +43,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4343
echo "Node: $(node -v)\nNPM: $(npm -v)\nYarn: $(yarn -v)\nTypeScript: $(tsc -v)"
4444

4545
# Ensure the current user is root and verify permissions
46-
RUN echo "whoami: $(whoami)" \
46+
RUN echo "whoami: $(whoami)" && \
4747
# The "id" command should confirm the user is root
48-
&& id \
48+
id && \
4949
# Make the "/root" folder readable for all users
50-
&& chmod 755 /root \
50+
chmod 755 /root && \
5151
# Check where Node.js loads required modules
52-
&& node -p 'module.paths'
52+
node -p 'module.paths'
5353

5454
# Install Helm, OpenShift CLI, ocm-cli, and yq
5555
RUN curl -fsSL -o /tmp/helm.tar.gz "https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz" && \

0 commit comments

Comments
 (0)