diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml index 642ba930..03920eda 100644 --- a/.github/workflows/publish-docker-images.yml +++ b/.github/workflows/publish-docker-images.yml @@ -48,56 +48,3 @@ jobs: fleetbase-api files: | ./docker-bake.hcl - - aws-marketplace-ecr-release: - name: Build and Push to AWS ECR - runs-on: ubuntu-latest - needs: docker-release - - env: - REGISTRY: ${{ secrets.AWS_ECR_REGISTRY }}/fleetbase - VERSION: ${{ github.event.inputs.version || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && github.ref_name) || 'manual' }} - - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.branch || github.ref_name }} - submodules: recursive - - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v3 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ secrets.AWS_REGION }} - - - name: Manually log in to Amazon ECR (Marketplace-style) - run: | - aws ecr get-login-password --region ${{ secrets.AWS_ECR_REGION }} | \ - docker login --username AWS --password-stdin ${{ secrets.AWS_ECR_REGISTRY }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Bake and Push to ECR - uses: docker/bake-action@v2 - with: - push: true - files: | - ./docker-bake.hcl - targets: | - fleetbase-api - fleetbase-console - - - name: Verify ECR Images - run: | - aws ecr describe-images \ - --registry-id ${{ secrets.AWS_ECR_REGISTRY_ID }} \ - --repository-name fleetbase/fleetbase-api \ - --region ${{ secrets.AWS_ECR_REGION }} - - aws ecr describe-images \ - --registry-id ${{ secrets.AWS_ECR_REGISTRY_ID }} \ - --repository-name fleetbase/fleetbase-console \ - --region ${{ secrets.AWS_ECR_REGION }} diff --git a/builds/osx/build-osx.sh b/builds/osx/build-osx.sh index 05eec31f..e334c264 100755 --- a/builds/osx/build-osx.sh +++ b/builds/osx/build-osx.sh @@ -122,7 +122,7 @@ export CMAKE_OSX_ARCHITECTURES=arm64 STATIC_PHP_CLI_DIR="$OSX_DIR/frankenphp/dist/static-php-cli" if [ ! -d "$STATIC_PHP_CLI_DIR" ]; then log "Cloning static-php-cli into dist/..." - git clone https://github.com/crazywhalecc/static-php-cli.git "$STATIC_PHP_CLI_DIR" + git clone --depth 1 --branch 2.5.2 https://github.com/crazywhalecc/static-php-cli.git "$STATIC_PHP_CLI_DIR" else log_warn "static-php-cli already exists in dist/. Skipping clone." fi diff --git a/docker/Dockerfile b/docker/Dockerfile index 7ac1c26e..9d084aba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -75,7 +75,7 @@ ENV QUEUE_CONNECTION=redis ENV CADDYFILE_PATH=/fleetbase/Caddyfile ENV CONSOLE_PATH=/fleetbase/console ENV OCTANE_SERVER=frankenphp -ENV FLEETBASE_VERSION=0.7.7 +ENV FLEETBASE_VERSION=0.7.8 # Set environment ARG ENVIRONMENT=production