diff --git a/docker/images/ci/Dockerfile b/docker/images/ci/Dockerfile index 6e600d1..25a8819 100644 --- a/docker/images/ci/Dockerfile +++ b/docker/images/ci/Dockerfile @@ -12,15 +12,18 @@ 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 \ - && 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/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 \