Skip to content

Commit

Permalink
General updates for the project setup (#198)
Browse files Browse the repository at this point in the history
- Specify the linux/amd64 platform.
- Update the composer digest.
- Use `docker compose` instead of `docker-compose`.
- Update the latest commit from the JS SDK.
  • Loading branch information
rwngallego authored Oct 25, 2024
1 parent d8ee115 commit 15f461d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:

wordpress:
image: custom-wordpress:5.6-php7.2-apache
platform: linux/amd64
restart: always
ports:
- 80:80
Expand All @@ -21,6 +22,7 @@ services:

db:
image: mysql:5.7
platform: linux/amd64
volumes:
- ./data:/var/lib/mysql
ports:
Expand Down
2 changes: 1 addition & 1 deletion public/js/perfecty-push-sdk

0 comments on commit 15f461d

Please sign in to comment.