diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 84d2ecca..b1ce879b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -14,7 +14,7 @@ on: jobs: files: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-low outputs: matrix: ${{ steps.dockerfile.outputs.matrix }} @@ -39,7 +39,7 @@ jobs: echo "matrix=$FILES" >> "$GITHUB_OUTPUT" build: - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, self-hosted] needs: files strategy: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1b227b4a..3c95c157 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,7 +21,7 @@ on: jobs: push_to_registry: - runs-on: ubuntu-latest + runs-on: [ubuntu-latest, self-hosted] name: Push Docker image ${{ github.event.inputs.folderPath }}${{ github.event.inputs.suffix }}:${{ github.event.inputs.tagName }} to GitHub Packages diff --git a/shallow-server/Dockerfile b/shallow-server/Dockerfile index 94410f48..536bc144 100644 --- a/shallow-server/Dockerfile +++ b/shallow-server/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm # Update repos install packages and cleanup # all in one step so we avoid large intermediate layers. @@ -7,13 +7,13 @@ RUN apt-get update && \ wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \ echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \ apt-get update && \ - apt-get install -y php8.1-cli php8.1-common php8.1-mbstring \ - php8.1-gd php8.1-imagick php8.1-intl php8.1-bz2 php8.1-xml \ - php8.1-mysql php8.1-zip php8.1-dev curl php8.1-curl \ - php-dompdf php8.1-apcu redis-server php8.1-redis php8.1-smbclient \ - php8.1-ldap unzip php8.1-pgsql php8.1-sqlite make apache2 \ - php8.1-opcache libmagickcore-6.q16-2-extra \ - libapache2-mod-php8.1 php-pear libaio1 build-essential expect && \ + apt-get install -y php8.2-cli php8.2-common php8.2-mbstring \ + php8.2-gd php8.2-imagick php8.2-intl php8.2-bz2 php8.2-xml \ + php8.2-mysql php8.2-zip php8.2-dev curl php8.2-curl \ + php-dompdf php8.2-apcu redis-server php8.2-redis php8.2-smbclient \ + php8.2-ldap unzip php8.2-pgsql php8.2-sqlite make apache2 \ + php8.2-opcache libmagickcore-6.q16-2-extra \ + libapache2-mod-php8.2 php-pear libaio1 build-essential expect && \ apt-get autoremove -y && apt-get autoclean && apt-get clean && \ rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* @@ -23,9 +23,9 @@ RUN chmod +x /tmp/oci8-setup.sh && \ /tmp/oci8-setup.sh && \ rm -f /tmp/oci8-setup.sh -COPY apc-cli-enable.ini /etc/php/8.1/cli/conf.d/99-apc-cli-enable.ini -COPY oci8-enable.ini /etc/php/8.1/apache2/conf.d/99-oci8-enable.ini -COPY opcache-recommended.ini /etc/php/8.1/cli/conf.d/99-opcache-recommended.ini +COPY apc-cli-enable.ini /etc/php/8.2/cli/conf.d/99-apc-cli-enable.ini +COPY oci8-enable.ini /etc/php/8.2/apache2/conf.d/99-oci8-enable.ini +COPY opcache-recommended.ini /etc/php/8.2/cli/conf.d/99-opcache-recommended.ini WORKDIR /var/www/html @@ -51,7 +51,7 @@ ADD ssl/nextcloud.crt /etc/ssl/certs/nextcloud.crt ADD ssl/nextcloud.key /etc/ssl/private/nextcloud.key ADD ssl/default-ssl.conf /etc/apache2/sites-available/default-ssl.conf ADD default-nextcloud.conf /etc/apache2/sites-enabled/default-nextcloud.conf -ADD nextcloud.ini /etc/php/8.1/apache2/conf.d/nextcloud.ini +ADD nextcloud.ini /etc/php/8.2/apache2/conf.d/nextcloud.ini RUN chmod +x /usr/local/bin/*