From 53191e36ce527985e597fc97565f7a8f136fdbe5 Mon Sep 17 00:00:00 2001 From: magroski Date: Fri, 25 Mar 2022 07:44:54 -0300 Subject: [PATCH 1/6] Add Phalcon 4.1 --- docker/images/ci/Dockerfile | 2 +- docker/images/flux/base/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/images/ci/Dockerfile b/docker/images/ci/Dockerfile index 6e600d1..ac4b62a 100644 --- a/docker/images/ci/Dockerfile +++ b/docker/images/ci/Dockerfile @@ -12,11 +12,11 @@ RUN apt-get update \ RUN apt-get install ruby-dev rubygems \ git \ nodejs \ + npm \ yarn \ python3-dev python3-pip\ ssh sshpass \ zip --assume-yes \ - && gem update --system \ && gem install sass --no-user-install \ && npm install -g grunt-cli \ && pip3 install awsebcli --upgrade \ diff --git a/docker/images/flux/base/Dockerfile b/docker/images/flux/base/Dockerfile index 6176cda..2a412b9 100644 --- a/docker/images/flux/base/Dockerfile +++ b/docker/images/flux/base/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/phalcon-framework:3.4-php-7.3-apache-buster +FROM talentify/phalcon-framework:4.1-php-7.4-apache-bullseye LABEL description="Base image for Flux application." # Install dependencies @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \ libxml2-dev \ librabbitmq-dev \ libssh-dev \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-install mysqli \ && docker-php-ext-install pcntl \ From 7c41816dd09b2ba8fe67eeebb64205d44ece9fc4 Mon Sep 17 00:00:00 2001 From: magroski Date: Mon, 22 Aug 2022 18:03:56 -0300 Subject: [PATCH 2/6] upgrade --- docker/images/flux/dev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/flux/dev/Dockerfile b/docker/images/flux/dev/Dockerfile index 62634be..3625ccc 100644 --- a/docker/images/flux/dev/Dockerfile +++ b/docker/images/flux/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base +FROM talentify/flux:base-upgrade LABEL description="Image for development on Flux application." # Install git in order to allow composer to clone talentify/ repositories. From e625392cea6efac911638a85dd50ce8afba2d11d Mon Sep 17 00:00:00 2001 From: magroski Date: Tue, 23 Aug 2022 08:37:37 -0300 Subject: [PATCH 3/6] upgrade --- docker/images/flux/dev/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/images/flux/dev/Dockerfile b/docker/images/flux/dev/Dockerfile index 3625ccc..f4bbe7f 100644 --- a/docker/images/flux/dev/Dockerfile +++ b/docker/images/flux/dev/Dockerfile @@ -22,5 +22,7 @@ RUN pecl install xdebug-2.9.7 \ && cat /tmp/xdebug.ini | grep -v '^#' >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \ && rm /tmp/xdebug.ini +RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf + # Add composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer From 551613f47b013a25937b44e25ac98cee32c6bbba Mon Sep 17 00:00:00 2001 From: magroski Date: Tue, 23 Aug 2022 14:37:01 -0300 Subject: [PATCH 4/6] upgrade version --- docker/images/ci/Dockerfile | 15 +++++++++------ docker/images/flux/dev/Dockerfile | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docker/images/ci/Dockerfile b/docker/images/ci/Dockerfile index ac4b62a..4ac85ca 100644 --- a/docker/images/ci/Dockerfile +++ b/docker/images/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base +FROM talentify/flux:base-phalcon41 LABEL description="Image for Flux's continuous integration." RUN apt-get update \ @@ -16,11 +16,14 @@ RUN apt-get install ruby-dev rubygems \ yarn \ python3-dev python3-pip\ ssh sshpass \ - zip --assume-yes \ - && gem install sass --no-user-install \ - && npm install -g grunt-cli \ - && pip3 install awsebcli --upgrade \ - && curl -sOL https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz \ + zip --assume-yes + +RUN gem install sass --no-user-install \ + && npm install -g grunt-cli + +RUN pip3 install awsebcli --upgrade + +RUN curl -sOL https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.6.1.tar.gz \ && rm dockerize-linux-amd64-v0.6.1.tar.gz diff --git a/docker/images/flux/dev/Dockerfile b/docker/images/flux/dev/Dockerfile index f4bbe7f..29d4579 100644 --- a/docker/images/flux/dev/Dockerfile +++ b/docker/images/flux/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base-upgrade +FROM talentify/flux:base-phalcon41 LABEL description="Image for development on Flux application." # Install git in order to allow composer to clone talentify/ repositories. @@ -22,7 +22,7 @@ RUN pecl install xdebug-2.9.7 \ && cat /tmp/xdebug.ini | grep -v '^#' >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \ && rm /tmp/xdebug.ini -RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf +# RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf # Add composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer From ae3d506fff090fc56aad2975b7a3de4e25404e71 Mon Sep 17 00:00:00 2001 From: magroski Date: Tue, 30 Aug 2022 16:35:49 -0300 Subject: [PATCH 5/6] fixes --- docker/images/ci/Dockerfile | 2 +- docker/images/flux/dev/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/images/ci/Dockerfile b/docker/images/ci/Dockerfile index 4ac85ca..4f49a35 100644 --- a/docker/images/ci/Dockerfile +++ b/docker/images/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base-phalcon41 +FROM talentify/flux:base-v3.0.0 LABEL description="Image for Flux's continuous integration." RUN apt-get update \ diff --git a/docker/images/flux/dev/Dockerfile b/docker/images/flux/dev/Dockerfile index 29d4579..62634be 100644 --- a/docker/images/flux/dev/Dockerfile +++ b/docker/images/flux/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base-phalcon41 +FROM talentify/flux:base LABEL description="Image for development on Flux application." # Install git in order to allow composer to clone talentify/ repositories. @@ -22,7 +22,5 @@ RUN pecl install xdebug-2.9.7 \ && cat /tmp/xdebug.ini | grep -v '^#' >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini" \ && rm /tmp/xdebug.ini -# RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf - # Add composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer From b3e7eeae4792e34b4e87fb5c45d7cbef78d95b0d Mon Sep 17 00:00:00 2001 From: magroski Date: Tue, 30 Aug 2022 16:47:18 -0300 Subject: [PATCH 6/6] fixes --- docker/images/ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/ci/Dockerfile b/docker/images/ci/Dockerfile index 4f49a35..25a8819 100644 --- a/docker/images/ci/Dockerfile +++ b/docker/images/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM talentify/flux:base-v3.0.0 +FROM talentify/flux:base LABEL description="Image for Flux's continuous integration." RUN apt-get update \