From da52732c46228b61e8f6483e696f55f9ee0e66c8 Mon Sep 17 00:00:00 2001
From: PedroTroller <pierre.plazanet@knplabs.com>
Date: Sat, 4 Feb 2023 11:01:07 +0100
Subject: [PATCH] test: fix tests by removing docker and docker-compose install

---
 .circleci/config.yml |  6 ------
 Dockerfile           | 38 ++++++++++++++++++--------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e87c6f2..c935533 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,8 +13,6 @@ jobs:
       docker_layer_caching: false
     steps:
       - checkout
-      - docker/install-docker
-      - docker/install-docker-compose
       - run: |
           docker-compose pull dev
           docker-compose build dev
@@ -31,8 +29,6 @@ jobs:
           echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
           echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
       - checkout
-      - docker/install-docker
-      - docker/install-docker-compose
       - docker/check
       - run: |
           docker-compose pull prod
@@ -51,8 +47,6 @@ jobs:
           echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
           echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
       - checkout
-      - docker/install-docker
-      - docker/install-docker-compose
       - docker/check
       - run: |
           docker-compose pull prod
diff --git a/Dockerfile b/Dockerfile
index 979d21e..949d14c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,35 +7,33 @@ FROM php:7.4.12-apache AS prod
 RUN (curl -sL https://deb.nodesource.com/setup_16.x | bash) \
  && apt-get update \
  && apt-get install -y --no-install-recommends \
-        git \
-        libghc-gnuidn-dev \
-        locales \
-        nodejs \
-        perl \
-        python3 \
-        python3-pip \
-        ruby-full \
-        unzip \
-        zlib1g-dev \
+        git=1:2.20.1-2+deb10u7 \
+        libghc-gnuidn-dev=0.2.2-7+b1 \
+        locales=2.28-10+deb10u2 \
+        nodejs=16.19.0-deb-1nodesource1 \
+        perl=5.28.1-6+deb10u1 \
+        python3=3.7.3-1 \
+        python3-pip=18.1-5 \
+        ruby-full=1:2.5.1 \
+        unzip=6.0-23+deb10u3 \
+        zlib1g-dev=1:1.2.11.dfsg-1+deb10u2 \
  && pip3 install docutils==0.14 \
- && gem install bundler \
+ && gem install bundler -v 2.3.26 \
  && rm -rf /var/lib/apt/lists/* \
  && python3 --version \
- && ruby --version
-
-RUN bundle config set no-cache 'true'
-
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-
-RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
-    locale-gen && \
-    locale -a
+ && ruby --version \
+ && bundle config set no-cache 'true' \
+ && echo en_US.UTF-8 UTF-8 > /etc/locale.gen \
+ && locale-gen \
+ && locale -a
 
 ENV LANG=en_US.UTF-8
 ENV PATH /var/www/node_modules/.bin:$PATH
 
 WORKDIR /var/www
 
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
 COPY Gemfile* /var/www/
 COPY composer.* /var/www/
 COPY package* /var/www/