From b4294d3fade682abb229634cb665ebe38a3ba7b7 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 14:51:27 +0100 Subject: [PATCH 01/40] dockerize project --- .docker/Dockerfile | 18 ++++++++++++++++++ .docker/compose.yml | 10 ++++++++++ .docker/hosts/file-explorer.conf | 18 ++++++++++++++++++ .gitea/workflows/build.yaml | 14 ++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 .docker/Dockerfile create mode 100644 .docker/compose.yml create mode 100644 .docker/hosts/file-explorer.conf create mode 100644 .gitea/workflows/build.yaml diff --git a/.docker/Dockerfile b/.docker/Dockerfile new file mode 100644 index 0000000..f89c3a2 --- /dev/null +++ b/.docker/Dockerfile @@ -0,0 +1,18 @@ +FROM php:8.2-apache + +RUN apt-get update \ + && apt-get install -qq -y --no-install-recommends \ + cron \ + nano \ + locales coreutils apt-utils git libicu-dev g++ libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; + +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen + +RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ + mv composer.phar /usr/local/bin/composer + +RUN docker-php-ext-configure intl +RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite +RUN pecl install apcu && docker-php-ext-enable apcu + +WORKDIR /var/www diff --git a/.docker/compose.yml b/.docker/compose.yml new file mode 100644 index 0000000..30c9003 --- /dev/null +++ b/.docker/compose.yml @@ -0,0 +1,10 @@ +services: + file-explorer: + build: . + container_name: file-explorer + ports: + - "8080:80" + volumes: + - ./hosts:/etc/apache2/sites-enabled + - ../:/var/www/project + restart: unless-stopped diff --git a/.docker/hosts/file-explorer.conf b/.docker/hosts/file-explorer.conf new file mode 100644 index 0000000..a7ab71e --- /dev/null +++ b/.docker/hosts/file-explorer.conf @@ -0,0 +1,18 @@ + + ServerName localhost + + DocumentRoot /var/www/project/public + DirectoryIndex /index.php + + + AllowOverride None + Order Allow,Deny + Allow from All + + +# +# FallbackResource disabled +# + ErrorLog /var/log/apache2/project_error.log + CustomLog /var/log/apache2/project_access.log combined + diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..9135e98 --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,14 @@ +name: build +on: push +# pull_request: +# types: +# - closed +# branches: +# - main +jobs: + deploy: + runs-on: debian-latest + steps: + - name: test + run: echo "test" + -- 2.47.2 From 1a89e6bea5b15e74c339dc0a1e81eeccde7f8b4b Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 14:52:36 +0100 Subject: [PATCH 02/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9135e98..73598e3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -7,7 +7,7 @@ on: push # - main jobs: deploy: - runs-on: debian-latest + runs-on: ubuntu-latest steps: - name: test run: echo "test" -- 2.47.2 From 35ef9ee8ccf0741c910414daaeb8293b91681b46 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 14:57:07 +0100 Subject: [PATCH 03/40] add build step --- .gitea/workflows/build.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 73598e3..b2565f3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -6,9 +6,10 @@ on: push # branches: # - main jobs: - deploy: + build: runs-on: ubuntu-latest steps: - - name: test - run: echo "test" + - name: build + working-directory: .docker + run: docker build -t git.simonis.lol/sites/file-explorer:latest . -- 2.47.2 From f789ad9df9906a7ce50b108b77e076d928ed371f Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 14:59:40 +0100 Subject: [PATCH 04/40] test --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index b2565f3..79a47d3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,5 +11,6 @@ jobs: steps: - name: build working-directory: .docker - run: docker build -t git.simonis.lol/sites/file-explorer:latest . +# run: docker build -t git.simonis.lol/sites/file-explorer:latest . + run: docker --version -- 2.47.2 From b124d1d074a958d4899e67c5afaae65e8a3f8544 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:01:00 +0100 Subject: [PATCH 05/40] test --- .gitea/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 79a47d3..21bdca3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,7 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - name: build - working-directory: .docker # run: docker build -t git.simonis.lol/sites/file-explorer:latest . run: docker --version -- 2.47.2 From d72e4e7cc69136d5d81854be4d647f59a7ae3291 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:01:16 +0100 Subject: [PATCH 06/40] test --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 21bdca3..ba529dd 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,6 +10,5 @@ jobs: runs-on: ubuntu-latest steps: - name: build -# run: docker build -t git.simonis.lol/sites/file-explorer:latest . - run: docker --version + run: docker build -t git.simonis.lol/sites/file-explorer:latest . -- 2.47.2 From 5fcfcde59bee98b09d506317c299c9870cd21fcf Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:01:52 +0100 Subject: [PATCH 07/40] test --- .gitea/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ba529dd..52e70ce 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,5 +10,5 @@ jobs: runs-on: ubuntu-latest steps: - name: build - run: docker build -t git.simonis.lol/sites/file-explorer:latest . - +# run: docker build -t git.simonis.lol/sites/file-explorer:latest . + run: ls -- 2.47.2 From bcb1bf28513b85ff6053c4c9acaab2e22606e758 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:02:16 +0100 Subject: [PATCH 08/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 52e70ce..3ccad67 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,4 +11,4 @@ jobs: steps: - name: build # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - run: ls + run: ls && pwd -- 2.47.2 From a625bd12aa4c526e197fa4297014ab270744084d Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:09:47 +0100 Subject: [PATCH 09/40] test --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3ccad67..ecf459e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,6 +9,7 @@ jobs: build: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v + # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: build -# run: docker build -t git.simonis.lol/sites/file-explorer:latest . run: ls && pwd -- 2.47.2 From f898aecac236ea65c9c7dfbf2b6dfe9004cb9ce9 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:10:07 +0100 Subject: [PATCH 10/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ecf459e..cae519d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v + - uses: actions/checkout@v4 # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: build run: ls && pwd -- 2.47.2 From a2c17325febe57e82ce9aae82e074ce61d858be6 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:10:48 +0100 Subject: [PATCH 11/40] test --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index cae519d..8ba1a83 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -12,4 +12,5 @@ jobs: - uses: actions/checkout@v4 # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: build + working-directory: .docker run: ls && pwd -- 2.47.2 From 6090f909b056911cb4d2c84c50d58ce87b1d0466 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:11:18 +0100 Subject: [PATCH 12/40] test --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8ba1a83..485c0cd 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,7 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: build working-directory: .docker - run: ls && pwd + run: docker build -t git.simonis.lol/sites/file-explorer:latest . -- 2.47.2 From 703fbf755700b3f0f36176bdb44c17387c6fd7d8 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:21:35 +0100 Subject: [PATCH 13/40] test --- .gitea/workflows/build.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 485c0cd..d9b3c18 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,6 +10,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: build - working-directory: .docker - run: docker build -t git.simonis.lol/sites/file-explorer:latest . +# - name: build +# working-directory: .docker +# run: docker build -t git.simonis.lol/sites/file-explorer:latest . + + - name: login + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + +# - name: push +# run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file -- 2.47.2 From 41878f54b0e57b968bbf50c7719fd52f74e1c008 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:22:26 +0100 Subject: [PATCH 14/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d9b3c18..1bda41b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: login - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + run: echo "${{ secrets.DOCKER_PW }}" | docker login --username "${{ secrets.DOCKER_USER }}" --password-stdin # - name: push # run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file -- 2.47.2 From 1213a5e5918f783ca0b677f5f4f3053e8c24a015 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:23:58 +0100 Subject: [PATCH 15/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1bda41b..23439c3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: login - run: echo "${{ secrets.DOCKER_PW }}" | docker login --username "${{ secrets.DOCKER_USER }}" --password-stdin + run: echo "${{ secrets.DOCKER_PW }}" | docker login --username="${{ secrets.DOCKER_USER }}" --password-stdin # - name: push # run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file -- 2.47.2 From 30f2c9edee277ccfb125a1fb74f7e5cf35ee14cf Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:25:59 +0100 Subject: [PATCH 16/40] test --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 23439c3..bdb196f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: # run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: login - run: echo "${{ secrets.DOCKER_PW }}" | docker login --username="${{ secrets.DOCKER_USER }}" --password-stdin + run: echo "${{ secrets.DOCKER_PW }}" | docker login git.simonis.lol --username="${{ secrets.DOCKER_USER }}" --password-stdin # - name: push # run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file -- 2.47.2 From 83faf34ce1c1a00a5363ed8079590f50fb8fd0d2 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:27:26 +0100 Subject: [PATCH 17/40] test --- .gitea/workflows/build.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index bdb196f..cb7d2f8 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,12 +10,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 -# - name: build -# working-directory: .docker -# run: docker build -t git.simonis.lol/sites/file-explorer:latest . + - uses: actions/login@v1 + with: + registry: git.simonis.lol + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PW }} - - name: login - run: echo "${{ secrets.DOCKER_PW }}" | docker login git.simonis.lol --username="${{ secrets.DOCKER_USER }}" --password-stdin + - name: build + working-directory: .docker + run: docker build -t git.simonis.lol/sites/file-explorer:latest . -# - name: push -# run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file + - name: push + run: docker push git.simonis.lol/sites/file-explorer:latest \ No newline at end of file -- 2.47.2 From f6834afc1c50093431752441838559b4985ff605 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:31:43 +0100 Subject: [PATCH 18/40] test --- .gitea/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index cb7d2f8..42e7192 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,8 +9,8 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/login@v1 + - uses: git.simonis.lol/actions/checkout@v4 + - uses: git.simonis.lol/actions/login@v1 with: registry: git.simonis.lol username: ${{ secrets.DOCKER_USER }} -- 2.47.2 From aac3277198b55071a4ab02909512fe18f46acc82 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:32:53 +0100 Subject: [PATCH 19/40] test --- .gitea/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 42e7192..e96fd6f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,8 +9,8 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: git.simonis.lol/actions/checkout@v4 - - uses: git.simonis.lol/actions/login@v1 + - uses: actions/checkout@v4 + - uses: docker/login-action@v1 with: registry: git.simonis.lol username: ${{ secrets.DOCKER_USER }} -- 2.47.2 From 058af382f0963f3f6d4d87597e1af4b3bf99142c Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 15:33:48 +0100 Subject: [PATCH 20/40] test --- .gitea/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e96fd6f..7bb7049 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,8 +13,8 @@ jobs: - uses: docker/login-action@v1 with: registry: git.simonis.lol - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PW }} + username: ${{ vars.DOCKER_USER }} + password: ${{ vars.DOCKER_PW }} - name: build working-directory: .docker -- 2.47.2 From 28ad40c220f0de93936f1e06638c3f115512b052 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:31:21 +0100 Subject: [PATCH 21/40] add copy to dockerfile --- .docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index f89c3a2..2e30aa6 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -15,4 +15,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu +COPY ../* /var/www/project/ + WORKDIR /var/www -- 2.47.2 From 58e0c8d75c5f3c3e5dabcf432aa980d8daa16675 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:32:45 +0100 Subject: [PATCH 22/40] test --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 2e30aa6..256b50f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -15,6 +15,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -COPY ../* /var/www/project/ +COPY ../ /var/www/project/ WORKDIR /var/www -- 2.47.2 From cf09243bfe052da79ba681a6939f107d2323084b Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:35:32 +0100 Subject: [PATCH 23/40] test --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 256b50f..b360d65 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -15,6 +15,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -COPY ../ /var/www/project/ +COPY ../../ /var/www/project/ WORKDIR /var/www -- 2.47.2 From 498473686a4af02d1a84ca9d45f7d3ba8ecf8e69 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:36:48 +0100 Subject: [PATCH 24/40] move docker file remove compose.yml --- .docker/compose.yml | 10 ---------- .gitea/workflows/build.yaml | 1 - .docker/Dockerfile => Dockerfile | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .docker/compose.yml rename .docker/Dockerfile => Dockerfile (95%) diff --git a/.docker/compose.yml b/.docker/compose.yml deleted file mode 100644 index 30c9003..0000000 --- a/.docker/compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - file-explorer: - build: . - container_name: file-explorer - ports: - - "8080:80" - volumes: - - ./hosts:/etc/apache2/sites-enabled - - ../:/var/www/project - restart: unless-stopped diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7bb7049..4908122 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,7 +17,6 @@ jobs: password: ${{ vars.DOCKER_PW }} - name: build - working-directory: .docker run: docker build -t git.simonis.lol/sites/file-explorer:latest . - name: push diff --git a/.docker/Dockerfile b/Dockerfile similarity index 95% rename from .docker/Dockerfile rename to Dockerfile index b360d65..7f2f7cc 100644 --- a/.docker/Dockerfile +++ b/Dockerfile @@ -15,6 +15,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -COPY ../../ /var/www/project/ +COPY .. /var/www/project/ WORKDIR /var/www -- 2.47.2 From 84b6b46b734775d8c6bf1d006ab82cc0123f8ffd Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:38:56 +0100 Subject: [PATCH 25/40] copy apache site config --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 7f2f7cc..ed32e5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,5 +16,6 @@ RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom RUN pecl install apcu && docker-php-ext-enable apcu COPY .. /var/www/project/ +COPY .docker/hosts/file-explorer.conf /etc/apache2/sites-available/file-explorer.conf WORKDIR /var/www -- 2.47.2 From 6a59dd2073d990c52b20d52097a96c804645c911 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:41:03 +0100 Subject: [PATCH 26/40] test --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed32e5a..96f4504 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -COPY .. /var/www/project/ -COPY .docker/hosts/file-explorer.conf /etc/apache2/sites-available/file-explorer.conf +COPY . /var/www/project/ +COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-available/file-explorer.conf WORKDIR /var/www -- 2.47.2 From 8dfb598c189ebb633d363b050989d28e40f35ad1 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:41:56 +0100 Subject: [PATCH 27/40] fix copy path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96f4504..3f40254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,6 @@ RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom RUN pecl install apcu && docker-php-ext-enable apcu COPY . /var/www/project/ -COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-available/file-explorer.conf +COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf WORKDIR /var/www -- 2.47.2 From 1e33939e121e657ddf064f49139088b8e80c3c42 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:43:26 +0100 Subject: [PATCH 28/40] add composer install --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f40254..af28d82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM php:8.2-apache +COPY . /var/www/project/ +COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf + RUN apt-get update \ && apt-get install -qq -y --no-install-recommends \ cron \ @@ -15,7 +18,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -COPY . /var/www/project/ -COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf +RUN composer install --no-dev --no-install-recommends --no-interaction --no-progress --no-suggest --optimize-autoloader WORKDIR /var/www -- 2.47.2 From 9be0e7dfdfc6bfb4fc88a9f1c0f7040f31d3e40b Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:51:27 +0100 Subject: [PATCH 29/40] remove composer install options --- Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index af28d82..d1fda42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,7 @@ COPY . /var/www/project/ COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf RUN apt-get update \ - && apt-get install -qq -y --no-install-recommends \ - cron \ - nano \ - locales coreutils apt-utils git libicu-dev g++ libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; + && apt-get install -qq -y --no-install-recommends cron nano locales coreutils; RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen @@ -18,6 +15,6 @@ RUN docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -RUN composer install --no-dev --no-install-recommends --no-interaction --no-progress --no-suggest --optimize-autoloader +RUN composer install --no-dev --optimize-autoloader --no-suggest --no-progress -WORKDIR /var/www +WORKDIR /var/www/project -- 2.47.2 From 41ab0637c30ee7385bd9090efadab79d390d6e8e Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:55:32 +0100 Subject: [PATCH 30/40] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1fda42..f2b5caa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ mv composer.phar /usr/local/bin/composer -RUN docker-php-ext-configure intl +RUN #docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -- 2.47.2 From 487528f0e7bcccf004dc01c4b6b3455dd3aeadc8 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 16:56:57 +0100 Subject: [PATCH 31/40] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2b5caa..5f3d379 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ COPY . /var/www/project/ COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf RUN apt-get update \ - && apt-get install -qq -y --no-install-recommends cron nano locales coreutils; + && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen -- 2.47.2 From 6bf377dcf6aaa640ad09dd26cc6b0c0ea85cd3e5 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 17:01:31 +0100 Subject: [PATCH 32/40] test --- Dockerfile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f3d379..7627351 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,19 +2,20 @@ FROM php:8.2-apache COPY . /var/www/project/ COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf - -RUN apt-get update \ - && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; - -RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen - -RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ - mv composer.phar /usr/local/bin/composer - -RUN #docker-php-ext-configure intl -RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite -RUN pecl install apcu && docker-php-ext-enable apcu - -RUN composer install --no-dev --optimize-autoloader --no-suggest --no-progress +RUN ls; +# +#RUN apt-get update \ +# && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; +# +#RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen +# +#RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ +# mv composer.phar /usr/local/bin/composer +# +#RUN #docker-php-ext-configure intl +#RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite +#RUN pecl install apcu && docker-php-ext-enable apcu +# +#RUN composer install --no-dev --optimize-autoloader --no-suggest --no-progress WORKDIR /var/www/project -- 2.47.2 From 412e254eab2d2368392b55b1459233fd00ba0f5c Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 17:02:51 +0100 Subject: [PATCH 33/40] test --- Dockerfile | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7627351..64e045f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,20 +2,18 @@ FROM php:8.2-apache COPY . /var/www/project/ COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf -RUN ls; -# -#RUN apt-get update \ -# && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; -# -#RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen -# -#RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ -# mv composer.phar /usr/local/bin/composer -# -#RUN #docker-php-ext-configure intl -#RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite -#RUN pecl install apcu && docker-php-ext-enable apcu -# -#RUN composer install --no-dev --optimize-autoloader --no-suggest --no-progress + +RUN apt-get update \ + && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; + +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen + +RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ + mv composer.phar /usr/local/bin/composer + +RUN #docker-php-ext-configure intl +RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite +RUN pecl install apcu && docker-php-ext-enable apcu WORKDIR /var/www/project +RUN composer install --no-dev --optimize-autoloader --no-suggest --no-progress -- 2.47.2 From 7e758f4c126aebcba23f4d49d4afc99e2134bfac Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 17:11:37 +0100 Subject: [PATCH 34/40] add test route --- src/Controller/test.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/Controller/test.php diff --git a/src/Controller/test.php b/src/Controller/test.php new file mode 100644 index 0000000..9a84de1 --- /dev/null +++ b/src/Controller/test.php @@ -0,0 +1,17 @@ + Date: Wed, 4 Dec 2024 17:32:46 +0100 Subject: [PATCH 35/40] add apache pack --- composer.json | 3 +-- composer.lock | 28 ++++++++++++++++++- public/.htaccess | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ symfony.lock | 12 +++++++++ 4 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 public/.htaccess diff --git a/composer.json b/composer.json index 8207207..1b5051d 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "php": ">=8.2", "ext-ctype": "*", "ext-iconv": "*", + "symfony/apache-pack": "^1.0", "symfony/console": "7.1.*", "symfony/dotenv": "7.1.*", "symfony/flex": "^2", @@ -14,8 +15,6 @@ "symfony/runtime": "7.1.*", "symfony/yaml": "7.1.*" }, - "require-dev": { - }, "config": { "allow-plugins": { "php-http/discovery": true, diff --git a/composer.lock b/composer.lock index fd8da51..d225af6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "50f9c0973acafa44bb359f58b30b8e58", + "content-hash": "d1f0fa31fe64ca4ea5c91953de30ae9a", "packages": [ { "name": "psr/cache", @@ -208,6 +208,32 @@ }, "time": "2024-09-11T13:17:53+00:00" }, + { + "name": "symfony/apache-pack", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/apache-pack.git", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/apache-pack/zipball/3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "shasum": "" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for Apache support in Symfony", + "support": { + "issues": "https://github.com/symfony/apache-pack/issues", + "source": "https://github.com/symfony/apache-pack/tree/master" + }, + "time": "2017-12-12T01:46:35+00:00" + }, { "name": "symfony/cache", "version": "v7.1.7", diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..f7345df --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,70 @@ +# Use the front controller as index file. It serves as a fallback solution when +# every other rewrite/redirect fails (e.g. in an aliased environment without +# mod_rewrite). Additionally, this reduces the matching process for the +# start page (path "/") because otherwise Apache will apply the rewriting rules +# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). +DirectoryIndex index.php + +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. +# Options +SymLinksIfOwnerMatch + +# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve +# to the front controller "/index.php" but be rewritten to "/index.php/index". + + Options -MultiViews + + + + # This Option needs to be enabled for RewriteRule, otherwise it will show an error like + # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden' + Options +SymLinksIfOwnerMatch + + RewriteEngine On + + # Determine the RewriteBase automatically and set it as environment variable. + # If you are using Apache aliases to do mass virtual hosting or installed the + # project in a subdirectory, the base path will be prepended to allow proper + # resolution of the index.php file and to redirect to the correct URI. It will + # work in environments without path prefix as well, providing a safe, one-size + # fits all solution. But as you do not need it in this case, you can comment + # the following 2 lines to eliminate the overhead. + RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$ + RewriteRule .* - [E=BASE:%1] + + # Sets the HTTP_AUTHORIZATION header removed by Apache + RewriteCond %{HTTP:Authorization} .+ + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0] + + # Redirect to URI without front controller to prevent duplicate content + # (with and without `/index.php`). Only do this redirect on the initial + # rewrite by Apache and not on subsequent cycles. Otherwise we would get an + # endless redirect loop (request -> rewrite to front controller -> + # redirect -> request -> ...). + # So in case you get a "too many redirects" error or you always get redirected + # to the start page because your Apache does not expose the REDIRECT_STATUS + # environment variable, you have 2 choices: + # - disable this feature by commenting the following 2 lines or + # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the + # following RewriteCond (best solution) + RewriteCond %{ENV:REDIRECT_STATUS} ="" + RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] + + # If the requested filename exists, simply serve it. + # We only want to let Apache serve files and not directories. + # Rewrite all other queries to the front controller. + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ %{ENV:BASE}/index.php [L] + + + + + # When mod_rewrite is not available, we instruct a temporary redirect of + # the start page to the front controller explicitly so that the website + # and the generated links can still be used. + RedirectMatch 307 ^/$ /index.php/ + # RedirectTemp cannot be used instead + + diff --git a/symfony.lock b/symfony.lock index 5267cab..a42bde2 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,4 +1,16 @@ { + "symfony/apache-pack": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "main", + "version": "1.0", + "ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1" + }, + "files": [ + "public/.htaccess" + ] + }, "symfony/console": { "version": "7.1", "recipe": { -- 2.47.2 From edb59e37535fdc40cf8820732f9f70a03989565d Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 18:08:03 +0100 Subject: [PATCH 36/40] test --- .docker/hosts/file-explorer.conf | 16 ++++++++++------ src/test.php | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 src/test.php diff --git a/.docker/hosts/file-explorer.conf b/.docker/hosts/file-explorer.conf index a7ab71e..67ced55 100644 --- a/.docker/hosts/file-explorer.conf +++ b/.docker/hosts/file-explorer.conf @@ -5,14 +5,18 @@ DirectoryIndex /index.php - AllowOverride None + AllowOverride All Order Allow,Deny - Allow from All + Require all granted + + RewriteEngine On + + + + + FallbackResource disabled -# -# FallbackResource disabled -# ErrorLog /var/log/apache2/project_error.log CustomLog /var/log/apache2/project_access.log combined - + \ No newline at end of file diff --git a/src/test.php b/src/test.php new file mode 100644 index 0000000..da8e4b4 --- /dev/null +++ b/src/test.php @@ -0,0 +1,22 @@ + 'onKernelException']; + } + + public function onKernelException(ExceptionEvent $event) + { + $event->setResponse(new Response('test')); + } +} \ No newline at end of file -- 2.47.2 From d892ffed340a321ddb8f624aad5fdf5b2f5749b4 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 18:24:35 +0100 Subject: [PATCH 37/40] fix some stuff --- .docker/hosts/file-explorer.conf | 2 -- Dockerfile | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/hosts/file-explorer.conf b/.docker/hosts/file-explorer.conf index 67ced55..4cde023 100644 --- a/.docker/hosts/file-explorer.conf +++ b/.docker/hosts/file-explorer.conf @@ -6,8 +6,6 @@ AllowOverride All - Order Allow,Deny - Require all granted RewriteEngine On diff --git a/Dockerfile b/Dockerfile index 64e045f..973098a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM php:8.2-apache COPY . /var/www/project/ COPY ./.docker/hosts/file-explorer.conf /etc/apache2/sites-enabled/file-explorer.conf +RUN chown -R www-data:www-data /var/www/project + RUN apt-get update \ && apt-get install -qq -y --no-install-recommends cron nano locales coreutils libicu-dev libpng-dev libxml2-dev libzip-dev libonig-dev libxslt-dev; -- 2.47.2 From 502a5d5bda83f35925eee9c6d57855ff747ede98 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 18:29:46 +0100 Subject: [PATCH 38/40] remove debug stuff --- src/Controller/test.php | 17 ----------------- src/test.php | 22 ---------------------- 2 files changed, 39 deletions(-) delete mode 100644 src/Controller/test.php delete mode 100644 src/test.php diff --git a/src/Controller/test.php b/src/Controller/test.php deleted file mode 100644 index 9a84de1..0000000 --- a/src/Controller/test.php +++ /dev/null @@ -1,17 +0,0 @@ - 'onKernelException']; - } - - public function onKernelException(ExceptionEvent $event) - { - $event->setResponse(new Response('test')); - } -} \ No newline at end of file -- 2.47.2 From 939130dcbeb4e339b9045f5998c86e28f61ba551 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 18:34:48 +0100 Subject: [PATCH 39/40] remove debug stuff --- .gitea/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4908122..a244a4c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,10 +1,10 @@ name: build -on: push -# pull_request: -# types: -# - closed -# branches: -# - main +on: + pull_request: + types: + - closed + branches: + - main jobs: build: runs-on: ubuntu-latest -- 2.47.2 From a1471ac7ff8e2f5a350c2e784a6cdd861e77c9f3 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 4 Dec 2024 18:36:41 +0100 Subject: [PATCH 40/40] remove useless line --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 973098a..4f54837 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \ mv composer.phar /usr/local/bin/composer -RUN #docker-php-ext-configure intl RUN docker-php-ext-install pdo pdo_mysql mysqli gd opcache intl zip calendar dom mbstring zip gd xsl && a2enmod rewrite RUN pecl install apcu && docker-php-ext-enable apcu -- 2.47.2