Skip to content

Commit b2541dd

Browse files
committed
Handle kustomize for both older and newer php version base images. Put yarn back in place.
1 parent 65fe011 commit b2541dd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN curl -s https://get.helm.sh/helm-v3.6.2-linux-"$(dpkg --print-architecture)"
2222

2323
# Install Kustomize
2424
# https://kubectl.docs.kubernetes.io/installation/kustomize/binaries/
25-
RUN cd /bin/ && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash && mv /usr/kustomize /bin
25+
RUN cd /bin/ && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash && if [ -e /usr/kustomize ]; then mv /usr/kustomize /bin; fi
2626

2727
# Install AWS cli
2828
COPY awscli.pubkey /tmp/
@@ -52,7 +52,7 @@ SHELL ["/bin/bash", "-c"]
5252
# Install additional global npm dependencies
5353
RUN \
5454
# Initialize the user environment (this loads nvm)
55-
. "$HOME"/.profile
55+
. "$HOME"/.profile && npm install -g yarn
5656

5757
# IMPORTANT! Switching back to the root user as the last instruction.
5858
USER root

0 commit comments

Comments
 (0)