Compare commits

..

No commits in common. "local-deploy" and "main" have entirely different histories.

9 changed files with 21 additions and 105 deletions

View File

@ -1,4 +1,4 @@
docker build . -t rose-ash-ghost:$1
docker build mysql -t rose-ash-mysql:$1
docker build invite-token/app -f invite-token/app/Dockerfile -t invite-token:$1
docker build . -t rose-ash-ghost
docker build mysql -t rose-ash-mysql
docker build invite-token/app -f invite-token/app/Dockerfile -t invite-token

View File

@ -1,7 +1,7 @@
{
"url": "http://localhost:3001",
"url": "http://localhost:2368",
"server": {
"port": 3001,
"port": 2368,
"host": "::"
},
"mail": {

View File

@ -1,7 +1,7 @@
{
"url": "$URL",
"url": "http://localhost:2368",
"server": {
"port": $PORT,
"port": 2368,
"host": "::"
},
"mail": $EMAIL,

View File

@ -1,3 +0,0 @@
docker stack rm rose-ash
. ./.env
for i in 1 2 3 4 5 6 7 8 9 10; do sleep 5 && docker stack deploy -c docker-compose-localhost.yml rose-ash && break ; done

View File

@ -1,4 +1,5 @@
export VERSION=$1
export NODE=$3
docker stack rm $2
for i in 1 2 3 4 5 6 7 8 9 10; do sleep 5 && docker stack deploy -c docker-compose.yml $2 --with-registry-auth && break ; done
docker stack rm rose-ash
. ./.env
echo $CERTBOT_EMAIL
echo $DOMAIN
for i in 1 2 3 4 5 6 7 8 9 10; do sleep 5 && docker stack deploy -c docker-compose.yml rose-ash && break ; done

View File

@ -1,75 +0,0 @@
version: "3.3"
services:
ghost:
image: rose-ash-ghost:latest
env_file:
- ./.env
volumes:
- ghost-content:/var/lib/ghost/content
- ./settings:/var/lib/ghost/content/settings
- ./themes/:/var/lib/ghost/content/themes
networks:
- appnet
- externalnet
secrets:
- email
- db-password
#ports:
# - 2368:2368
deploy:
placement:
constraints: [node.labels.node == production ]
invite-token:
image: invite-token
environment:
MYSQL_USER: ghost
MYSQL_PASSWORD: ghostdbpass
MYSQL_DATABASE: ghostdb
MYSQL_HOST: db
PORT: 3002
networks:
- appnet
- externalnet
deploy:
placement:
constraints: [node.labels.node == production ]
ports:
# donot expose in production!!!
- 3010:3002
db:
image: rose-ash-mysql:latest
environment:
MYSQL_ROOT_PASSWORD: mysqlrootpass
MYSQL_USER: ghost
MYSQL_PASSWORD: ghostdbpass
MYSQL_DATABASE: ghostdb
volumes:
- ghost-mysql-db:/var/lib/mysql
networks:
- appnet
secrets:
- db-password
- db-root-password
deploy:
placement:
constraints: [node.labels.node == production ]
volumes:
ghost-content:
ghost-config:
ghost-mysql-db:
networks:
appnet:
driver: overlay
externalnet:
driver: overlay
external: true
secrets:
email:
file: ./.email
db-password:
file: ./.db-password
db-root-password:
file: ./.db-root-password

View File

@ -1,9 +1,10 @@
version: "3.3"
services:
ghost:
image: registry.rose-ash.com/rose-ash-ghost:${VERSION}
env_file:
- ./.env
image: rose-ash-ghost:latest
environment:
url: https://rose-ash.com/
NODE_ENV: production
volumes:
- ghost-content:/var/lib/ghost/content
- ./settings:/var/lib/ghost/content/settings
@ -14,14 +15,12 @@ services:
secrets:
- email
- db-password
#ports:
# - 2368:2368
deploy:
placement:
constraints: [node.labels.node == $NODE ]
constraints: [node.labels.node == production ]
invite-token:
image: registry.rose-ash.com/invite-token:${VERSION}
image: invite-token
environment:
MYSQL_USER: ghost
MYSQL_PASSWORD: ghostdbpass
@ -33,13 +32,10 @@ services:
- externalnet
deploy:
placement:
constraints: [node.labels.node == $NODE ]
#ports:
# donot expose in production!!!
#- 3010:3002
constraints: [node.labels.node == production ]
db:
image: registry.rose-ash.com/rose-ash-mysql:${VERSION}
image: rose-ash-mysql:latest
environment:
MYSQL_ROOT_PASSWORD: mysqlrootpass
MYSQL_USER: ghost
@ -54,7 +50,7 @@ services:
- db-root-password
deploy:
placement:
constraints: [node.labels.node == $NODE ]
constraints: [node.labels.node == production ]
volumes:
ghost-content:
ghost-config:

View File

@ -1,3 +0,0 @@
docker push registry.rose-ash.com/rose-ash-ghost:$1
docker push registry.rose-ash.com/invite-token:$1
docker push registry.rose-ash.com/rose-ash-mysql:$1