Create separate version builds

Author: mike-potter

build.sh

@@ -2,9 +2,19 @@
 
 set -e
 
-versions=("7.2" "7.3" "7.4")
-default_version="7.3"
-for version in $versions; do
-  docker build --build-arg DOCKSAL_CLI=2-php${version} -t outrigger/cli:2-php${version} .
+# Get the versions to build
+
+# If they are passed as args
+if [ $# -gt 0 ]; then
+  buildDirs="$@"
+else
+  # else, get all the relevant dirs
+  buildDirs=$(ls | grep -E '^php[0-9\.]+$')
+fi
+
+# Build each one of them
+for version in $buildDirs; do
+  pushd $version
+  docker build -t outrigger/cli:2-${version} .
+  popd
 done
-#docker tag "outrigger/cli:2-php${default_version}" "outrigger/cli:latest"

Dockerfile php7.2/DockerfileDockerfile renamed to php7.2/Dockerfile

@@ -2,8 +2,7 @@
 #
 # Note how we use cli:2 here, which refers the latest available 2.x version
 # So that we wouldn't need to update this every time new version of Docksal cli releases
-ARG DOCKSAL_CLI=2-php7.3
-FROM docksal/cli:$DOCKSAL_CLI
+FROM docksal/cli:2-php7.2
 
 # Puppeteer dependencies taken from https://github.com/alekzonder/docker-puppeteer
 # Install addtional apt packages needed for pa11y and puppeteer

php7.3/Dockerfile

@@ -0,0 +1,48 @@
+# Extend the Docksal CLI per https://docs.docksal.io/stack/extend-images/
+#
+# Note how we use cli:2 here, which refers the latest available 2.x version
+# So that we wouldn't need to update this every time new version of Docksal cli releases
+FROM docksal/cli:2-php7.3
+
+# Puppeteer dependencies taken from https://github.com/alekzonder/docker-puppeteer
+# Install addtional apt packages needed for pa11y and puppeteer
+# Added vim.
+RUN apt-get update && \
+  apt-get install -yq gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
+  libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
+  libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
+  libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+  fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst \
+  ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget vim && \
+  apt-get --purge remove && \
+  apt-get clean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
+
+ARG HELM_VERSION=v2.12.3
+
+# Next install tools from phase2/docker-gitlab-ci-workspace
+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 && \
+  chmod +x /usr/local/bin/kubectl && \
+  curl -o ./install_helm.sh https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
+  chmod +x ./install_helm.sh && \
+  ./install_helm.sh -v ${HELM_VERSION} && \
+  helm init --client-only
+
+# All further commands will be performed as the docker user.
+USER docker
+SHELL ["/bin/bash", "-c"]
+
+# Remove ruby from Docksal CLI
+RUN \
+	# Initialize the user environment (this loads rvm)
+	. $HOME/.profile && \
+    rvm remove ruby-${RUBY_VERSION_INSTALL}
+
+# Install additional global npm dependencies
+RUN \
+	# Initialize the user environment (this loads nvm)
+	. $HOME/.profile && \
+	# Install node packages
+	npm install -g [email protected] pa11y@5 pa11y-ci@2 http-server
+
+# IMPORTANT! Switching back to the root user as the last instruction.
+USER root

php7.4/Dockerfile

@@ -0,0 +1,48 @@
+# Extend the Docksal CLI per https://docs.docksal.io/stack/extend-images/
+#
+# Note how we use cli:2 here, which refers the latest available 2.x version
+# So that we wouldn't need to update this every time new version of Docksal cli releases
+FROM docksal/cli:2-php7.4
+
+# Puppeteer dependencies taken from https://github.com/alekzonder/docker-puppeteer
+# Install addtional apt packages needed for pa11y and puppeteer
+# Added vim.
+RUN apt-get update && \
+  apt-get install -yq gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
+  libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
+  libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
+  libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+  fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst \
+  ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget vim && \
+  apt-get --purge remove && \
+  apt-get clean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
+
+ARG HELM_VERSION=v2.12.3
+
+# Next install tools from phase2/docker-gitlab-ci-workspace
+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 && \
+  chmod +x /usr/local/bin/kubectl && \
+  curl -o ./install_helm.sh https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
+  chmod +x ./install_helm.sh && \
+  ./install_helm.sh -v ${HELM_VERSION} && \
+  helm init --client-only
+
+# All further commands will be performed as the docker user.
+USER docker
+SHELL ["/bin/bash", "-c"]
+
+# Remove ruby from Docksal CLI
+RUN \
+	# Initialize the user environment (this loads rvm)
+	. $HOME/.profile && \
+    rvm remove ruby-${RUBY_VERSION_INSTALL}
+
+# Install additional global npm dependencies
+RUN \
+	# Initialize the user environment (this loads nvm)
+	. $HOME/.profile && \
+	# Install node packages
+	npm install -g [email protected] pa11y@5 pa11y-ci@2 http-server
+
+# IMPORTANT! Switching back to the root user as the last instruction.
+USER root