diff --git a/.env.bref b/.env.bref index 1646cf9d..15563b0e 100644 --- a/.env.bref +++ b/.env.bref @@ -1,5 +1,5 @@ -ENVIRONMENT=dev -SECURITY_KEY=temp +CRAFT_ENVIRONMENT=dev +CRAFT_SECURITY_KEY=temp DB_SERVER=postgres DB_DATABASE=europa diff --git a/.env.docker b/.env.docker index 794624a3..e4724a4b 100644 --- a/.env.docker +++ b/.env.docker @@ -1,4 +1,4 @@ -SECURITY_KEY=temp +CRAFT_SECURITY_KEY=temp HOST_WEB_PORT=8080 HOST_DB_PORT= diff --git a/.env.example b/.env.example index 09b9474b..9d59cddc 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ -ENVIRONMENT=dev +CRAFT_ENVIRONMENT=dev -SECURITY_KEY= +CRAFT_SECURITY_KEY= DB_DRIVER=pgsql DB_SERVER=localhost diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml deleted file mode 100644 index 0c2295d5..00000000 --- a/.github/workflows/build-and-push.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Build and push docker images - -on: - workflow_dispatch: - inputs: - dockerhub_push: - default: true - required: true - type: boolean - push: - branches: - - staging - - release: - types: [published] - -jobs: - build: - runs-on: ubuntu-latest - name: Build and push to Docker Hub - steps: - - name: Check out the repository - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - with: - install: true - - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build craftcms/demo-europa:staging - if: github.ref == 'refs/heads/staging' - uses: docker/build-push-action@v2 - with: - push: ${{ github.event.inputs.dockerhub_push || github.event_name == 'push' }} - platforms: linux/amd64,linux/arm64 - tags: craftcms/demo-europa:staging - - - name: Build craftcms/demo-europa:latest - if: github.ref == 'refs/heads/main' - uses: docker/build-push-action@v2 - with: - push: ${{ github.event.inputs.dockerhub_push || github.event_name == 'release' }} - platforms: linux/amd64,linux/arm64 - tags: craftcms/demo-europa:latest diff --git a/.github/workflows/update-and-reseed.yml b/.github/workflows/update-and-reseed.yml index 39d099f4..3d0c4247 100644 --- a/.github/workflows/update-and-reseed.yml +++ b/.github/workflows/update-and-reseed.yml @@ -2,8 +2,8 @@ name: Update dependencies and reseed on: workflow_dispatch: - schedule: - - cron: "0 */12 * * *" +# schedule: +# - cron: "0 */12 * * *" jobs: update_and_reseed: diff --git a/config/general.php b/config/general.php index 556f564f..a5fcb7fe 100644 --- a/config/general.php +++ b/config/general.php @@ -36,7 +36,7 @@ 'enableCsrfProtection' => true, 'useEmailAsUsername' => true, 'omitScriptNameInUrls' => true, - 'securityKey' => App::env('SECURITY_KEY'), + 'securityKey' => App::env('CRAFT_SECURITY_KEY'), 'maxInvalidLogins' => 1000, 'maxUploadFileSize' => 20000000, 'resourceBasePath' => dirname(__DIR__) . '/web/cpresources', diff --git a/web/index.php b/web/index.php index d777d4a0..2c6156c2 100644 --- a/web/index.php +++ b/web/index.php @@ -20,7 +20,7 @@ } define('CRAFT_STREAM_LOG', true); -define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production'); +define('CRAFT_ENVIRONMENT', getenv('CRAFT_ENVIRONMENT') ?: 'production'); if ($storagePath = getenv('CRAFT_STORAGE_PATH')) { define('CRAFT_STORAGE_PATH', $storagePath);