diff --git a/.github/workflows/build-image-v5.yaml b/.github/workflows/build-image-v5.yaml index 278a222..eae2752 100644 --- a/.github/workflows/build-image-v5.yaml +++ b/.github/workflows/build-image-v5.yaml @@ -16,7 +16,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml index d188a45..2902cea 100644 --- a/.github/workflows/publish-image.yaml +++ b/.github/workflows/publish-image.yaml @@ -1,9 +1,5 @@ -name: Publish Container Image +name: Publish Debian Container Images -# When its time to do a release do a full cross platform build for all supported -# architectures and push all of them to Docker Hub. -# Only trigger on semver shaped tags. -# Ref: https://github.com/metcalfc/docker-action-examples/blob/main/.github/workflows/release.yml on: push: tags-ignore: @@ -11,15 +7,23 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 + strategy: + matrix: + include: + - image: invoiceninja/invoiceninja-octane + context: ./debian + steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Updated from v2 + with: + fetch-depth: 0 - name: Prepare id: prep run: | - DOCKER_IMAGE=invoiceninja/invoiceninja + DOCKER_IMAGE=${{ matrix.image }} VERSION=edge if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} @@ -28,56 +32,44 @@ jobs: MAJOR="$(echo "${VERSION}" | cut -d. -f1)" MINOR="$(echo "${VERSION}" | cut -d. -f2)" TAGS="$TAGS,${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:${MAJOR}.${MINOR}" - if [[ $VERSION =~ ^5\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:latest" - fi - echo "tags=${TAGS}" >> $GITHUB_OUTPUT + + # Debug output + echo "Current version: ${VERSION}" + echo "Version pattern check: $([[ $VERSION =~ ^5\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && echo "matches" || echo "doesn't match")" + + TAGS="$TAGS,${DOCKER_IMAGE}:latest" + + echo "tags=${TAGS}" >> $GITHUB_OUTPUT # Updated output syntax echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "major=${MAJOR}" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 # Updated from v1 with: platforms: all - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-5-${{ hashFiles('alpine/5/cache_buster') }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-5-${{ hashFiles('alpine/5/cache_buster') }}- + uses: docker/setup-buildx-action@v3 # Updated from v1 - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v3 # Updated from v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 # Updated from v2 with: - builder: ${{ steps.buildx.outputs.name }} - context: ./alpine/${{ steps.prep.outputs.major }}/ + context: ${{ matrix.context }} build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }} - target: prod platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.prep.outputs.tags }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - - - name: Move cache - run: | - mkdir -p /tmp/.buildx-cache - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache + cache-from: type=gha # Updated cache type + cache-to: type=gha,mode=max - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} + run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index 0f1e214..d66a086 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -31,7 +31,7 @@ FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS phpbuild LABEL maintainer="David Bomba " -ARG php_require="bcmath gd pdo_mysql zip mbstring" +ARG php_require="bcmath gd pdo_mysql zip" ARG php_suggest="exif imagick intl pcntl soap" ARG php_extra="opcache" @@ -47,28 +47,15 @@ RUN set -eux; \ chromium \ # font-noto-cjk-extra \ # font-wqy-zenhei \ - freetype \ - libpng \ - libjpeg-turbo \ - freetype-dev \ - libpng-dev \ - libjpeg-turbo-dev \ ttf-freefont \ ttf-dejavu -COPY --from=ghcr.io/mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ - -RUN install-php-extensions \ +# Install PHP extensions +RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \ ${php_require} \ ${php_suggest} \ ${php_extra} -# Install PHP extensions -# RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \ -# ${php_require} \ -# ${php_suggest} \ -# ${php_extra} - # Copy files COPY rootfs /