Skip to content

Commit

Permalink
Merge pull request #242 from wunderio/release/2024-08-27
Browse files Browse the repository at this point in the history
Release 2024-08-27
  • Loading branch information
Rade333 authored Aug 27, 2024
2 parents 6dd9ff5 + 1fac919 commit 4cc3f28
Show file tree
Hide file tree
Showing 25 changed files with 140 additions and 48 deletions.
6 changes: 3 additions & 3 deletions silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/php:8.1.7
FROM cimg/php:8.1.29

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
Expand Down Expand Up @@ -50,14 +50,14 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 16.15.1
ENV NODE_VERSION 16.20.2
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.5
ENV YARN_VERSION 1.22.22
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
10 changes: 5 additions & 5 deletions silta-cicd/circleci-php8.1-node16-composer2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.1.7` with the following additions:
A docker image used circleCI, based on `cimg/php:8.1.29` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
Expand All @@ -9,8 +9,8 @@ A docker image used circleCI, based on `cimg/php:8.1.7` with the following addit
- Yarn

## Versions
- PHP: 8.1.7
- Composer: 2.1.12
- Node: 16.15.1
- Yarn: 1.22.5
- PHP: 8.1.29
- Composer: 2.5.1
- Node: 16.20.2
- Yarn: 1.22.22
- Helm: v3.14.0
2 changes: 1 addition & 1 deletion silta-cicd/circleci-php8.1-node16-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
circleci-php8.1-node16-composer2-v1
circleci-php8.1-node16-composer2-v1.5
circleci-php8.1-node16-composer2-v1.5.0
circleci-php8.1-node16-composer2-v1.5.1
6 changes: 3 additions & 3 deletions silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/php:8.1.23
FROM cimg/php:8.1.29

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
Expand Down Expand Up @@ -49,14 +49,14 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 18.17.1
ENV NODE_VERSION 18.20.4
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.19
ENV YARN_VERSION 1.22.22
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
8 changes: 4 additions & 4 deletions silta-cicd/circleci-php8.1-node18-composer2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.1.23` with the following additions:
A docker image used circleCI, based on `cimg/php:8.1.29` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
Expand All @@ -9,8 +9,8 @@ A docker image used circleCI, based on `cimg/php:8.1.23` with the following addi
- Yarn

## Versions
- PHP: 8.1.23
- PHP: 8.1.29
- Composer: 2.5.1
- Node: 18.17.1
- Yarn: 1.22.19
- Node: 18.20.4
- Yarn: 1.22.22
- Helm: v3.14.0
2 changes: 1 addition & 1 deletion silta-cicd/circleci-php8.1-node18-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
circleci-php8.1-node18-composer2-v1
circleci-php8.1-node18-composer2-v1.5
circleci-php8.1-node18-composer2-v1.5.0
circleci-php8.1-node18-composer2-v1.5.1
72 changes: 72 additions & 0 deletions silta-cicd/circleci-php8.2-node16-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
FROM cimg/php:8.2.22

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"

# Upgrade packages
RUN sudo apt update && sudo apt upgrade && sudo apt clean

# Install drush
ENV DRUSH_LAUNCHER_VERSION 0.9.1
RUN sudo wget -q https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_LAUNCHER_VERSION}/drush.phar -O /usr/local/bin/drush \
&& sudo chmod +x /usr/local/bin/drush

# Install vim based on popular demand.
RUN sudo apt-get update && sudo apt-get install vim && sudo apt-get clean

# Add gcloud CLI and kubectl
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
&& sudo apt-get install apt-transport-https ca-certificates \
&& curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
&& sudo apt-get update && sudo apt-get install google-cloud-sdk-gke-gcloud-auth-plugin kubectl \
&& sudo apt-get clean

# Install AWS cli and aws-iam-authenticator, git, python
RUN sudo apt install -y git python3 \
&& sudo apt-get install -y unzip curl \
&& sudo apt-get clean \
&& sudo curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
&& sudo unzip awscliv2.zip \
&& sudo ./aws/install \
&& sudo rm -rf awscliv2.zip \
&& sudo rm -rf ./aws

# Install Helm 3
ENV HELM_VERSION v3.14.0
ENV FILENAME helm-${HELM_VERSION}-linux-amd64.tar.gz
ENV HELM_URL https://get.helm.sh/${FILENAME}

RUN curl -o /tmp/$FILENAME ${HELM_URL} \
&& tar -zxvf /tmp/${FILENAME} -C /tmp \
&& rm /tmp/${FILENAME} \
&& sudo mv /tmp/linux-amd64/helm /bin/helm \
&& helm repo add bitnami https://charts.bitnami.com/bitnami \
# && helm repo add minio https://helm.min.io/ \
&& helm repo add wunderio https://storage.googleapis.com/charts.wdr.io \
&& helm repo add percona https://percona.github.io/percona-helm-charts/ \
&& helm plugin install https://github.com/quintush/helm-unittest --version 0.2.4

# NOTE: quintush/helm-unittest v0.2.0 release breaks helm tests.

# TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
# switch back to using https://github.com/lrills/helm-unittest as the source

# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 16.15.1
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.22
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg

# Add custom php config and lift memory limit.
COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
16 changes: 16 additions & 0 deletions silta-cicd/circleci-php8.2-node16-composer2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.2.22` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
- Vim, useful for debugging
- kubernetes and helm
- Node.js
- Yarn

## Versions
- PHP: 8.2.22
- Composer: 2.7.7
- Node: 16.15.1
- Yarn: 1.22.22
- Helm: v3.14.0
3 changes: 3 additions & 0 deletions silta-cicd/circleci-php8.2-node16-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
circleci-php8.2-node16-composer2-v1
circleci-php8.2-node16-composer2-v1.0
circleci-php8.2-node16-composer2-v1.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
memory_limit = -1
6 changes: 3 additions & 3 deletions silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/php:8.2.12
FROM cimg/php:8.2.22

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
Expand Down Expand Up @@ -49,14 +49,14 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 18.18.2
ENV NODE_VERSION 18.20.4
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.19
ENV YARN_VERSION 1.22.22
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
10 changes: 5 additions & 5 deletions silta-cicd/circleci-php8.2-node18-composer2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.2.12` with the following additions:
A docker image used circleCI, based on `cimg/php:8.2.22` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
Expand All @@ -9,8 +9,8 @@ A docker image used circleCI, based on `cimg/php:8.2.12` with the following addi
- Yarn

## Versions
- PHP: 8.2.0
- Composer: 2.1.12
- Node: 18.18.2
- Yarn: 1.22.19
- PHP: 8.2.22
- Composer: 2.7.7
- Node: 18.20.4
- Yarn: 1.22.22
- Helm: v3.14.0
2 changes: 1 addition & 1 deletion silta-cicd/circleci-php8.2-node18-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
circleci-php8.2-node18-composer2-v1
circleci-php8.2-node18-composer2-v1.5
circleci-php8.2-node18-composer2-v1.5.0
circleci-php8.2-node18-composer2-v1.5.1
6 changes: 3 additions & 3 deletions silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/php:8.2.13
FROM cimg/php:8.2.22

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
Expand Down Expand Up @@ -49,14 +49,14 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 20.9.0
ENV NODE_VERSION 20.17.0
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
rm node.tar.xz && \
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs

ENV YARN_VERSION 1.22.19
ENV YARN_VERSION 1.22.22
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
sudo tar -xzf yarn.tar.gz -C /opt/ && \
rm yarn.tar.gz && \
Expand Down
10 changes: 5 additions & 5 deletions silta-cicd/circleci-php8.2-node20-composer2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.2.13` with the following additions:
A docker image used circleCI, based on `cimg/php:8.2.22` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
Expand All @@ -9,8 +9,8 @@ A docker image used circleCI, based on `cimg/php:8.2.13` with the following addi
- Yarn

## Versions
- PHP: 8.2.13
- Composer: 2.5.1
- Node: 20.9.0
- Yarn: 1.22.19
- PHP: 8.2.22
- Composer: 2.7.7
- Node: 20.17.0
- Yarn: 1.22.22
- Helm: v3.14.0
2 changes: 1 addition & 1 deletion silta-cicd/circleci-php8.2-node20-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
circleci-php8.2-node20-composer2-v1
circleci-php8.2-node20-composer2-v1.4
circleci-php8.2-node20-composer2-v1.4.0
circleci-php8.2-node20-composer2-v1.4.1
4 changes: 2 additions & 2 deletions silta-cicd/circleci-php8.2-node22-composer2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/php:8.2.20
FROM cimg/php:8.2.22

# Make composer packages executable.
ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
Expand Down Expand Up @@ -54,7 +54,7 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
# Install Node.js and Yarn.
# The following code is based on the CircleCI Node.js Dockerfile template:
# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
ENV NODE_VERSION 22.3.0
ENV NODE_VERSION 22.7.0
RUN echo "Installing Node.js version ${NODE_VERSION}"
RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
Expand Down
8 changes: 4 additions & 4 deletions silta-cicd/circleci-php8.2-node22-composer2/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# silta-circleci
A docker image used circleCI, based on `cimg/php:8.2.20` with the following additions:
A docker image used circleCI, based on `cimg/php:8.2.22` with the following additions:

- Composer configured correctly
- Drush-launcher and coder pre-installed
Expand All @@ -9,8 +9,8 @@ A docker image used circleCI, based on `cimg/php:8.2.20` with the following addi
- Yarn

## Versions
- PHP: 8.2.20
- Composer: 2.5.1
- Node: 22.3.0
- PHP: 8.2.22
- Composer: 2.7.7
- Node: 22.7.0
- Yarn: 1.22.22
- Helm: v3.14.0
2 changes: 1 addition & 1 deletion silta-cicd/circleci-php8.2-node22-composer2/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
circleci-php8.2-node22-composer2-v1
circleci-php8.2-node22-composer2-v1.0
circleci-php8.2-node22-composer2-v1.0.0
circleci-php8.2-node22-composer2-v1.0.1
2 changes: 1 addition & 1 deletion silta-nginx/1.26/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://hg.nginx.org/pkg-oss/tags
ARG NGINX_VERSION=1.26.0
ARG NGINX_VERSION=1.26.2

FROM nginx:${NGINX_VERSION}-alpine as builder

Expand Down
2 changes: 1 addition & 1 deletion silta-nginx/1.26/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1.26-v1
1.26-v1.0
1.26-v1.0.0
1.26-v1.0.1
2 changes: 1 addition & 1 deletion silta-node/20-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.16-alpine
FROM node:20.17-alpine

RUN apk add --no-cache openssh bash rsync curl tzdata

Expand Down
2 changes: 1 addition & 1 deletion silta-node/20-alpine/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
20-alpine-v1
20-alpine-v1.2
20-alpine-v1.2.1
20-alpine-v1.2.2
2 changes: 1 addition & 1 deletion silta-node/22-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22.6-alpine
FROM node:22.7-alpine

RUN apk add --no-cache openssh bash rsync curl tzdata

Expand Down
2 changes: 1 addition & 1 deletion silta-node/22-alpine/TAGS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
22-alpine-v1
22-alpine-v1.0
22-alpine-v1.0.1
22-alpine-v1.0.2

0 comments on commit 4cc3f28

Please sign in to comment.