From 5522d097a448c653933dee5f3da277198f7145ad Mon Sep 17 00:00:00 2001 From: Kovah Date: Sun, 19 Mar 2023 10:38:15 +0100 Subject: [PATCH] Minor release adjustments --- .github/workflows/build-docker.yml | 4 ++-- resources/docker/dockerfiles/release-base.Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 29db6ab1..7f778ab9 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -41,7 +41,7 @@ jobs: DOCKER_IMAGE_GITUHB=ghcr.io/kovah/linkace VERSION=${GITHUB_REF#refs/tags/} TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:latest,${DOCKER_IMAGE_GITUHB}:${VERSION},${DOCKER_IMAGE_GITUHB}:latest" - echo ::set-output name=tags::${TAGS} + echo "tags=${TAGS}" >> $GITHUB_OUTPUT - name: Build and push advanced image uses: docker/build-push-action@v2 @@ -59,7 +59,7 @@ jobs: DOCKER_IMAGE_GITHUB=ghcr.io/kovah/linkace VERSION=${GITHUB_REF#refs/tags/} TAGS="${DOCKER_IMAGE}:${VERSION}-php-nginx,${DOCKER_IMAGE}:php-nginx,${DOCKER_IMAGE}:${VERSION}-simple,${DOCKER_IMAGE}:simple,${DOCKER_IMAGE_GITHUB}:${VERSION}-php-nginx,${DOCKER_IMAGE_GITHUB}:php-nginx,${DOCKER_IMAGE_GITHUB}:${VERSION}-simple,${DOCKER_IMAGE_GITHUB}:simple" - echo ::set-output name=tags::${TAGS} + echo "tags=${TAGS}" >> $GITHUB_OUTPUT - name: Build and push simple image uses: docker/build-push-action@v2 diff --git a/resources/docker/dockerfiles/release-base.Dockerfile b/resources/docker/dockerfiles/release-base.Dockerfile index 472e3fbe..aa8689c7 100644 --- a/resources/docker/dockerfiles/release-base.Dockerfile +++ b/resources/docker/dockerfiles/release-base.Dockerfile @@ -1,7 +1,7 @@ FROM php:8.2-fpm-alpine # Install package and PHP dependencies -RUN apk add --no-cache mariadb-client postgresql postgresql-dev zip libzip-dev; \ +RUN apk add --no-cache mariadb-client postgresql postgresql-dev sqlite3 zip libzip-dev; \ docker-php-ext-configure zip; \ docker-php-ext-install bcmath pdo_mysql pdo_pgsql zip; \ mkdir /ssl-certs