diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 08b7eca..936adc2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,17 +16,16 @@ 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 }} @@ -34,7 +33,7 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | @@ -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' }} diff --git a/README.md b/README.md index 987e670..6bd3644 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index 367a4fc..f2d0a3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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} @@ -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