diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index c033cc9..c58bd90 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,9 +2,9 @@ name: Publish Docker image on: push: - branches: [ master, docker ] + branches: [ docker ] pull_request: - branches: [ master, docker ] + branches: [ docker ] env: DOCKER_ID: ${{ secrets.DOCKER_USERNAME }} diff --git a/docker-compose.yml b/docker-compose.yml index 1da2611..8d4653f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: # dockerfile: ./docker/Dockerfile # args: # - PHP_VERSION_SELECTED=${PHP_VERSION_SELECTED:-8.2} - image: tanhong/new-mvc-shop:docker + image: tanhong/new-mvc-shop container_name: '${APP_NAME:-new_mvc_shop}-server' ports: - '${APP_PORT:-85}:80'