From 6a08e8706c90dfbf2576f74364ccb35d89020b27 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Thu, 20 May 2021 15:21:21 +0700 Subject: [PATCH] fix M1 chip --- App/docker/db/build.sh | 2 +- App/docker/docker-compose.yaml | 2 ++ App/docker/php/Dockerfile | 2 +- App/docker/php/build.sh | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/App/docker/db/build.sh b/App/docker/db/build.sh index c1bc410..f58acbc 100755 --- a/App/docker/db/build.sh +++ b/App/docker/db/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker build -t vasyakrg/php-db . && docker push vasyakrg/php-db +docker buildx build --platform linux/amd64 --push -t vasyakrg/php-db . diff --git a/App/docker/docker-compose.yaml b/App/docker/docker-compose.yaml index badf7dc..a592498 100644 --- a/App/docker/docker-compose.yaml +++ b/App/docker/docker-compose.yaml @@ -8,6 +8,8 @@ services: MARIADB_USER: ${MARIADB_USER} MARIADB_PASSWORD: ${MARIADB_PASSWORD} MARIADB_DATABASE: ${MARIADB_DATABASE} + volumes: + - ./php/myapp:/var/www ports: - 80:80 networks: diff --git a/App/docker/php/Dockerfile b/App/docker/php/Dockerfile index 7d8fc15..476d6ac 100644 --- a/App/docker/php/Dockerfile +++ b/App/docker/php/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget \ git \ libpq-dev \ - && docker-php-ext-install mysqli pdo_pgsql pdo_mysql \ + && docker-php-ext-install pdo_mysql \ && apt-get update \ && rm -rf /var/lib/apt/lists/* diff --git a/App/docker/php/build.sh b/App/docker/php/build.sh index e956160..dbca4ea 100755 --- a/App/docker/php/build.sh +++ b/App/docker/php/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker build -t vasyakrg/php-app . && docker push vasyakrg/php-app +docker buildx build --platform linux/amd64 --push -t vasyakrg/php-app .