Skip to content

Commit

Permalink
Merge pull request #255 from PedroTroller/test/remove-docker-install
Browse files Browse the repository at this point in the history
test: fix tests by removing docker and docker-compose install
  • Loading branch information
PedroTroller authored Feb 4, 2023
2 parents 05db56e + da52732 commit 3c03dd0
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 26 deletions.
6 changes: 0 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
38 changes: 18 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 3c03dd0

Please sign in to comment.