diff options
| -rw-r--r-- | .github/workflows/build-docker-image.yaml | 31 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.alpine | 2 |
3 files changed, 19 insertions, 16 deletions
diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 942f86fcc..8f7c59df6 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -19,17 +19,20 @@ jobs: strategy: fail-fast: false matrix: - include: - - tag: "" # Default Dockerfile - platforms: linux/amd64 - - tag: aarch64 - platforms: linux/arm64 - - tag: alpine - platforms: linux/amd64,linux/arm64 - - tag: archlinux - platforms: linux/amd64,linux/arm64 - - tag: armv7 - platforms: linux/arm/v7 + tag: + - '' + - alpine + # include: + # - tag: "" # Default Dockerfile + # platforms: linux/amd64 + # - tag: aarch64 + # platforms: linux/arm64 + # - tag: alpine + # platforms: linux/amd64,linux/arm64 + # - tag: archlinux + # platforms: linux/amd64,linux/arm64 + # - tag: armv7 + # platforms: linux/arm/v7 runs-on: ubuntu-latest steps: - name: Docker meta @@ -43,7 +46,7 @@ jobs: flavor: | latest=auto prefix= - suffix=${{ matrix.tag != '' && format('-{0}', matrix.tag) || '' }} + suffix=${{ matrix.tag != '' && format('-{0}', matrix.tag)}} tags: | type=schedule type=ref,event=branch @@ -71,8 +74,8 @@ jobs: uses: docker/build-push-action@v6 with: # Use "Dockerfile" if matrix.tag is empty, otherwise use "Dockerfile.{tag}" - file: docker/${{ matrix.tag == '' && 'Dockerfile' || format('Dockerfile.{0}', matrix.tag) }} - platforms: ${{ matrix.platforms }} + file: docker/Dockerfile${{ matrix.tag != '' && format('.{0}', matrix.tag) }} + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/docker/Dockerfile b/docker/Dockerfile index c2f90c41c..25b9a0041 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ # docker run -d --name yacy -p 8090:8090 -p 8443:8443 -v yacy_data:/opt/yacy_search_server/DATA --log-opt max-size=200m --log-opt max-file=2 yacy/yacy_search_server:latest ## build base -FROM eclipse-temurin:11-jdk-jammy AS base +FROM eclipse-temurin:17 AS base RUN apt-get update && apt-get install -yq wkhtmltopdf imagemagick xvfb ghostscript && rm -rf /var/lib/apt/lists/* ## build app diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 627b5f0ef..f5e973fd0 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,7 +1,7 @@ # Build a docker image from latest YaCy sources on Alpine Linux # Base image : latest stable official jdk 11 image from Docker based on Alpine Linux -FROM openjdk:11-alpine +FROM eclipse-temurin:17-alpine # trace java version RUN java -version |