Skip to content

Commit a0a4990

Browse files
juliusknorrjuliusknorr
committed
fix: Remove mariadb-client and move to vim-tiny
Signed-off-by: Julius Knorr <[email protected]>
1 parent 06d90c7 commit a0a4990

File tree

11 files changed

+86
-122
lines changed

11 files changed

+86
-122
lines changed

‎docker/Dockerfile.php.template‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php71‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php72‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php73‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php74‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php80‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/Dockerfile.php81‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

‎docker/nginx/my_proxy.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ proxy_read_timeout 3600;
55
proxy_send_timeout 3600;
66
proxy_connect_timeout 3600;
77

8-
proxy_set_header X-Forwarded-Proto $scheme;
8+
#proxy_http_version 1.1;
9+
#proxy_set_header Upgrade $http_upgrade;
10+
#proxy_set_header Connection "Upgrade";
11+
12+
proxy_set_header X-Forwarded-Proto https;
913
# FIXME: remove this when onlyoffice is fixed https to http proxying
1014
# https://github.com/ONLYOFFICE/DocumentServer/issues/2186
11-
proxy_set_header CloudFront-Forwarded-Proto $scheme;
15+
proxy_set_header CloudFront-Forwarded-Proto $scheme;

‎docker/php82/Dockerfile‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ RUN install-php-extensions \
2727
blackfire \
2828
@composer
2929

30-
RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
31-
&& echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
32-
3330
# dev tools separate install so we quickly change without rebuilding all php extensions
3431
RUN apt update && apt-get install -y --no-install-recommends \
3532
git \
3633
curl \
37-
vim \
34+
vim-tiny \
3835
nano \
3936
sudo \
4037
cron \
@@ -47,23 +44,22 @@ RUN apt update && apt-get install -y --no-install-recommends \
4744
jq \
4845
ripgrep \
4946
rsync \
50-
mariadb-client \
51-
blackfire \
5247
&& rm -rf /var/lib/apt/lists/*
5348

5449
# Install PHPUnit
55-
RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
56-
&& chmod +x /usr/local/bin/phpunit8 \
57-
&& wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
58-
&& chmod +x /usr/local/bin/phpunit9 \
59-
&& ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
50+
RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
51+
&& chmod +x /usr/local/bin/phpunit11 \
52+
&& wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
53+
&& chmod +x /usr/local/bin/phpunit12 \
54+
&& ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
6055

6156
# Install NVM
6257
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
6358
&& export NVM_DIR="/root/.nvm" \
6459
&& . "$NVM_DIR/nvm.sh" \
6560
&& nvm install node \
66-
&& nvm alias default node
61+
&& nvm alias default node \
62+
&& nvm cache clear
6763

6864
RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
6965

0 commit comments

Comments
 (0)