Skip to content

Commit

Permalink
Merge pull request #2618 from phili67/phili67-docker-update-83
Browse files Browse the repository at this point in the history
Phili67 docker update 83
  • Loading branch information
phili67 committed Apr 21, 2024
2 parents cb2a3f1 + e30cb15 commit 98414d5
Show file tree
Hide file tree
Showing 19 changed files with 263 additions and 397 deletions.
9 changes: 2 additions & 7 deletions docker/README.md
Expand Up @@ -10,21 +10,16 @@ Basic LAMP stack environment built using Docker Compose. It consists of the foll

As of now, we have several different PHP versions. Use appropriate php version as needed:

- 5.4.x
- 5.6.x
- 7.1.x
- 7.2.x
- 7.3.x
- 7.4.x
- 8.0.x
- 8.1.x
- 8.2.x
- 8.3.x

## Installation

- Clone this repository on your local computer
- configure .env as needed
- It's better to activate directly the https protocol (see the https part).
- **IMPORTANT : You've to activate the https protocol (<u>see the https part</u>)**.
- follow the lines here :

```shell
Expand Down
58 changes: 0 additions & 58 deletions docker/bin/php54/Dockerfile

This file was deleted.

43 changes: 0 additions & 43 deletions docker/bin/php56/Dockerfile

This file was deleted.

52 changes: 0 additions & 52 deletions docker/bin/php71/Dockerfile

This file was deleted.

62 changes: 0 additions & 62 deletions docker/bin/php72/Dockerfile

This file was deleted.

62 changes: 0 additions & 62 deletions docker/bin/php73/Dockerfile

This file was deleted.

47 changes: 44 additions & 3 deletions docker/bin/php8/Dockerfile
Expand Up @@ -64,9 +64,8 @@ RUN cd /usr/local/src && \
make install && \
cd .. && \
rm -rf imagick && \
docker-php-ext-enable imagick \
sed -i_bak 's/rights="none" pattern="PDF"/rights="read | write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml

docker-php-ext-enable imagick

# Other PHP8 Extensions

RUN docker-php-ext-install pdo_mysql && \
Expand Down Expand Up @@ -102,3 +101,45 @@ RUN a2enmod rewrite headers

# Cleanup
RUN rm -rf /usr/src/*

####################################
#
# Run the rest of the installation
#
####################################
RUN sed -i_bak 's/rights=\"none\" pattern=\"PDF\"/rights=\"read | write\" pattern=\"PDF\"/' /etc/ImageMagick-6/policy.xml

#
# Add extra tools for dev
#

# add vim
RUN apt-get update && apt-get install -y vim jq htop && apt install -y gettext

# mise en place de nodejs + npm
RUN apt-get update && apt-get upgrade --no-install-recommends -qq -y
RUN apt-get install curl gnupg -y
RUN apt-get install jq -y

RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh && chmod 500 nsolid_setup_deb.sh && bash nsolid_setup_deb.sh 18 && rm nsolid_setup_deb.sh && apt-get install -y nodejs

# mise en place des dépendances
RUN node --version
RUN npm --version
RUN npm install -g npm
RUN npm install -g github:phili67/i18next-extract-gettext
RUN npm install i18next-conv -g
RUN npm install --global strip-json-comments-cli
RUN npm install grunt --save-dev
RUN npm install -g grunt-cli

#RUN npm install

RUN rm -rf /var/lib/apt/lists/*

# Set the locale
#RUN apt-get clean && apt-get update && apt-get install -y locales
RUN apt-get install -y locales locales-all
ENV LC_ALL fr_FR.UTF-8
ENV LANG fr_FR.UTF-8
ENV LANGUAGE fr_FR.UTF-8

0 comments on commit 98414d5

Please sign in to comment.