Skip to content

Commit

Permalink
some fixes to dockerfile and docker-compose.yml (#181)
Browse files Browse the repository at this point in the history
* Update Dockerfile

This change is necessary to make it run on latest OSX and M processor

* Update docker-compose.yml

Changed to maria db , no mysql image for M processor

* Fixed issues with dockerfile and docñer-compose to make it works on MAC with M processor

Database switched from mysql to mariadb
  • Loading branch information
granludo committed Mar 16, 2024
1 parent 7962384 commit 18358f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ FROM php:8.1-apache
#Install git
EXPOSE 80
# Modules that this needs
RUN apt-get update && apt-get install -y git netcat && apt-get clean -y
# RUN apt-get update && apt-get install -y git netcat && apt-get clean -y
RUN apt-get update && apt-get install -y git netcat-openbsd && apt-get clean -y

RUN docker-php-ext-install pdo pdo_mysql mysqli
RUN a2enmod rewrite
# Copy all of the files in
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3'
services:
db:
container_name: tsugi_db
image: mysql:5.7
image: mariadb:10.5
environment:
MYSQL_ROOT_PASSWORD: tsugi_root_pw
MYSQL_DATABASE: tsugi
Expand Down

0 comments on commit 18358f4

Please sign in to comment.