diff --git a/Dockerfile b/Dockerfile index 5360119..629a84b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get install -y --no-install-recommends ssl-cert && \ # Install composer RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ + && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ && php composer-setup.php \ && php -r "unlink('composer-setup.php');" \ && mv composer.phar /usr/local/bin/composer diff --git a/bin/run.sh b/bin/run.sh index 3b1bc98..774dcf4 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -17,7 +17,7 @@ PLUGIN_PATH="/var/www/html/wp-content/plugins/perfecty-push-wp" compose_exec() { declare command=$1 - docker-compose exec -T wordpress /bin/bash -l -c "$command" + docker compose exec -T wordpress /bin/bash -l -c "$command" } plugin_cmd() { @@ -34,15 +34,15 @@ setup() { } up() { - docker-compose up -d + docker compose up -d } down() { - docker-compose down + docker compose down } console() { - docker-compose exec wordpress /bin/bash + docker compose exec wordpress /bin/bash } wordpress() { diff --git a/docker-compose.yml b/docker-compose.yml index 21e4726..7f5ed9e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: wordpress: image: custom-wordpress:5.6-php7.2-apache + platform: linux/amd64 restart: always ports: - 80:80 @@ -21,6 +22,7 @@ services: db: image: mysql:5.7 + platform: linux/amd64 volumes: - ./data:/var/lib/mysql ports: diff --git a/public/js/perfecty-push-sdk b/public/js/perfecty-push-sdk index 6b97bbb..eb22f6a 160000 --- a/public/js/perfecty-push-sdk +++ b/public/js/perfecty-push-sdk @@ -1 +1 @@ -Subproject commit 6b97bbb4921557e2cb74bacb08155b6b28bc035e +Subproject commit eb22f6a9553fdf16dee50c7e33148addf4c4af8a