4 Commits

Author SHA1 Message Date
7729ea62b3 Merge branch 'develop' into main
All checks were successful
Build Docker / Build Master (push) Successful in 24s
Build Docker / Build Bot (push) Successful in 23s
Build Docker for Release / Build Master (push) Successful in 35s
Build Docker for Release / Build Bot (push) Successful in 34s
2023-08-25 18:26:43 +10:00
fca523f013 Revert "actions: Fix branch rule"
All checks were successful
Build Docker / Build Master (push) Successful in 28s
Build Docker / Build Bot (push) Successful in 27s
This reverts commit 4482f85ded.
2023-08-25 15:59:08 +10:00
4482f85ded actions: Fix branch rule 2023-08-25 15:54:58 +10:00
cd598cce47 Merge branch 'develop' into main 2023-08-25 15:54:41 +10:00
2 changed files with 2 additions and 24 deletions

View File

@@ -24,21 +24,6 @@ python3 -m pip install -r requirements.txt
cp .env.example .env
chmod +x wp.sh tlsa.sh
# Add proxy to docker
mkdir ~/.docker
echo """{
\"proxies\": {
\"default\": {
\"httpProxy\": \"http://proxy.hnsproxy.au:80\",
\"httpsProxy\": \"https://proxy.hnsproxy.au:443\",
\"noProxy\": \"localhost\"
}
}
}""" > ~/.docker/config.json
# Restart docker
sudo systemctl restart docker
# Pull docker images to save time later
docker pull mysql:5.7 &
docker pull wordpress:latest &

View File

@@ -56,16 +56,9 @@ services:
WORDPRESS_DB_PASSWORD: $MYSQL_PASSWORD
WORDPRESS_DB_NAME: WordPressDatabase
volumes:
- data:/var/www/html
[\"./:/var/www/html\"]
volumes:
mysql:
data:
driver: local
driver_opts:
o: "size=5g,uid=1000"
device: tmpfs
type: tmpfs
mysql: {}
""" > docker-compose.yml
# Start the containers