File tree Expand file tree Collapse file tree 2 files changed +20
-2
lines changed
Expand file tree Collapse file tree 2 files changed +20
-2
lines changed Original file line number Diff line number Diff line change 22#
33# Note how we use cli:2 here, which refers the latest available 2.x version
44# So that we wouldn't need to update this every time new version of Docksal cli releases
5- FROM docksal/cli:2-php7.3
5+ ARG DOCKSAL_CLI=2-php7.3
6+ FROM docksal/cli:$DOCKSAL_CLI
67
78# Puppeteer dependencies taken from https://github.com/alekzonder/docker-puppeteer
89# Install addtional apt packages needed for pa11y and puppeteer
@@ -17,6 +18,16 @@ RUN apt-get update && \
1718 apt-get --purge remove && \
1819 apt-get clean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
1920
21+ ARG HELM_VERSION=v2.12.3
22+
23+ # Next install tools from phase2/docker-gitlab-ci-workspace
24+ RUN curl -o /usr/local/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
25+ chmod +x /usr/local/bin/kubectl && \
26+ curl -o ./install_helm.sh https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
27+ chmod +x ./install_helm.sh && \
28+ ./install_helm.sh -v ${HELM_VERSION} && \
29+ helm init --client-only
30+
2031# All further commands will be performed as the docker user.
2132USER docker
2233SHELL ["/bin/bash" , "-c" ]
Original file line number Diff line number Diff line change 11#! /bin/sh
22
3- docker build -t outrigger/cli .
3+ set -e
4+
5+ versions=(" 7.2" " 7.3" " 7.4" )
6+ default_version=" 7.3"
7+ for version in $versions ; do
8+ docker build --build-arg DOCKSAL_CLI=2-php${version} -t outrigger/cli:2-php${version} .
9+ done
10+ # docker tag "outrigger/cli:2-php${default_version}" "outrigger/cli:latest"
You can’t perform that action at this time.
0 commit comments