Skip to content

Commit

Permalink
Merge branch 'master' into less_duplicates
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael-Schaer authored Oct 28, 2024
2 parents 158fc93 + 395a92f commit 555d6fe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: docker compose pull mysql

- name: create docker network
run: docker network create my-shared-network
run: docker network create gruene-services-bridge-network

- uses: satackey/action-docker-layer-caching@v0.0.11
continue-on-error: true
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
extra_hosts:
- "host.docker.internal:host-gateway"
networks:
- my-shared-network
- gruene-services-bridge-network

mysql:
image: mysql:5.7
Expand All @@ -44,7 +44,7 @@ services:
MYSQL_PASSWORD: laravel
container_name: wsmysql_webling
networks:
- my-shared-network
- gruene-services-bridge-network

phpmyadmin:
image: phpmyadmin/phpmyadmin
Expand All @@ -58,19 +58,19 @@ services:
PMA_PASSWORD: laravel
container_name: wsphpmyadmin_webling
networks:
- my-shared-network
- gruene-services-bridge-network

mailhog:
image: mailhog/mailhog
ports:
- '8020:8025'
container_name: wsmailhog_webling
networks:
- my-shared-network
- gruene-services-bridge-network

volumes:
database:

networks:
my-shared-network:
gruene-services-bridge-network:
external: true
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and start contributing 😍.
1. Start docker
1. Clone this repo `git clone https://github.com/grueneschweiz/weblingservice.git`
1. `cd` into the folder containing the repo
1. if it doesn't exists already, create the shared network `docker network create gruene-services-bridge-network`
1. Execute `docker compose run weblingservice composer install` and have a ☕️ while
it installs.
1. Execute `docker compose up -d` to start up the stack. The first time you run
Expand Down

0 comments on commit 555d6fe

Please sign in to comment.