diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index e10838d..38a6fe9 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -2,9 +2,9 @@ name: Docker Latest on: workflow_dispatch: - push: - branches: - - 2.x +# push: +# branches: +# - 2.x jobs: build-and-push: diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 3321e51..f508243 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -2,8 +2,8 @@ name: Docker Release on: workflow_dispatch: - release: - types: [ created ] +# release: +# types: [ created ] jobs: build-and-push: diff --git a/docker/Dockerfile b/docker/Dockerfile index 5e3b176..e8bc45b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,19 +8,15 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y # requirements -RUN apt-get install -y software-properties-common curl zip unzip gcc - -# nginx -RUN apt-get install -y nginx - -# php -RUN apt-get update \ - && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ - dnsutils librsvg2-bin fswatch wget openssh-client \ +RUN apt-get install -y software-properties-common curl zip unzip gcc nginx \ + cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ + dnsutils librsvg2-bin fswatch wget openssh-client \ && add-apt-repository ppa:ondrej/php -y \ && apt-get update \ && apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \ php8.2-curl php8.2-gettext php8.2-zip php8.2-bcmath php8.2-soap php8.2-redis php8.2-sqlite3 php8.2-intl + +# php COPY docker/php.ini /etc/php/8.2/cli/conf.d/99-vito.ini # composer