Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mik-p
mik-p committed Jun 1, 2024
2 parents d54536d + f899d53 commit b192c36
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion images/php-8.1/apache/v1.2.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.1/apache/v1.2.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.1/apache/v1.2.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.1/fpm/v1.2.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.1/fpm/v1.2.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.1/fpm/v1.2.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/apache/v1.2.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/apache/v1.2.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/apache/v1.2.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/fpm/v1.2.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/fpm/v1.2.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion images/php-8.2/fpm/v1.2.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN { \
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/local/bin --filename=composer

# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

# install wintercms, set laravel env, and create database
Expand Down
2 changes: 1 addition & 1 deletion templates/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/l

{% if TEMPLATE_PHP_VERSION != '7.4' -%}
# install latest nodejs via nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
nvm install 20

{% endif -%}
Expand Down

0 comments on commit b192c36

Please sign in to comment.