Skip to content

improvements to the docker setup #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StrangeGirlMurph wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improvements to the docker setup #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,24 @@ jobs:
permissions:
contents: read
packages: write
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Log into registry ${{ env.REGISTRY }}
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
Expand All @@ -44,7 +43,7 @@ jobs:

- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ curl -o .env https://raw.githubusercontent.com/aaronpk/Meetable/main/.env.exampl
```

2\. Fill in your configuration. At minimum: \
Set `APP_KEY` to a random 32-character string (for example you can run `crypto.randomUUID().replace(/-/g, '')` in your browser's console).
Set `APP_KEY` to a random 32-character string (for example `openssl rand -base64 32` or you can run `crypto.randomUUID().replace(/-/g, '')` in your browser's console).
Set the `APP_URL`, a secure `DB_PASSWORD` and `DB_ROOT_PASSWORD`.

3\. Start the containers:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ services:
app:
<<: *app-config
ports:
- "8080:80"
- "127.0.0.1:8080:80/tcp"
depends_on:
- db
- redis
volumes:
- meetable_storage:/var/www/html/storage/app
- ./storage:/var/www/html/storage/app

worker:
<<: *app-config
Expand All @@ -29,10 +29,10 @@ services:
- db
- redis
volumes:
- meetable_storage:/var/www/html/storage/app
- ./storage:/var/www/html/storage/app

db:
image: mariadb:10.11
image: mariadb:12
restart: unless-stopped
environment:
MYSQL_DATABASE: ${DB_DATABASE:-laravel}
Expand All @@ -43,7 +43,7 @@ services:
- meetable_db:/var/lib/mysql

redis:
image: redis:7-alpine
image: redis:8-alpine
restart: unless-stopped
volumes:
- meetable_redis:/data
Expand Down