From bc1bc8c45dd5bb188c9d2d2c83cafcb96b06955b Mon Sep 17 00:00:00 2001 From: po_taka Date: Thu, 30 Nov 2023 21:32:26 +0200 Subject: [PATCH 1/4] packages bump --- docker/web/Dockerfile | 18 ++++++++++-------- docker/web/dev/Dockerfile | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile index a8b48de..6ca26e0 100644 --- a/docker/web/Dockerfile +++ b/docker/web/Dockerfile @@ -20,7 +20,7 @@ RUN a2enmod rewrite ssl expires RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list -ENV PHP_V="8.2" +ENV PHP_V="8.3" RUN apt-get update && \ apt-get install -y php$PHP_V \ @@ -36,18 +36,20 @@ RUN update-alternatives --set php /usr/bin/php${PHP_V} COPY php.ini /etc/php/${PHP_V}/apache2/php.ini # end php -RUN wget https://getcomposer.org/download/2.4.3/composer.phar -O /usr/local/bin/composer && \ +RUN wget https://getcomposer.org/download/2.6.5/composer.phar -O /usr/local/bin/composer && \ chmod +x /usr/local/bin/composer # js stuff -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - -RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - -RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +ENV NODE_MAJOR=21 +RUN mkdir /etc/apt/keyrings && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +# build-essentials are needed by yarn RUN apt-get update && \ - apt-get install -y nodejs && \ - apt-get install -y --no-install-recommends yarn + apt-get install -y nodejs build-essential + +RUN npm install --global yarn # end js WORKDIR /var/www diff --git a/docker/web/dev/Dockerfile b/docker/web/dev/Dockerfile index bf711ee..aea1fd7 100644 --- a/docker/web/dev/Dockerfile +++ b/docker/web/dev/Dockerfile @@ -5,7 +5,7 @@ RUN a2ensite 000-default-ssl COPY cert/server.key /etc/ssl/private/apache.key COPY cert/server.crt /etc/ssl/certs/apache.crt -ENV PHP_V="8.2" +ENV PHP_V="8.3" #RUN apt-get update && \ # apt-get install -y php${PHP_V}-xdebug From 00a2aaf30b6cc797bbd207fc3878a3532f4806cb Mon Sep 17 00:00:00 2001 From: po_taka Date: Thu, 30 Nov 2023 21:34:00 +0200 Subject: [PATCH 2/4] bump php to 8.3.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e6c4977..296760a 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "type": "project", "license": "MIT License", "require": { - "php": ">=8.2", + "php": "8.3.*", "ext-ctype": "*", "ext-iconv": "*", "composer/package-versions-deprecated": "1.11.99.2", From 1c7e660b6fece146726168cff0d2552b0ffab297 Mon Sep 17 00:00:00 2001 From: po_taka Date: Thu, 30 Nov 2023 21:35:26 +0200 Subject: [PATCH 3/4] bump php --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index a69b0e4..87d5c4f 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -9,7 +9,7 @@ jobs: - name: Setup PHP with specific version of PECL extension uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.3' - name: Install Composer dependencies run: composer install --no-progress --optimize-autoloader - name: "phpcs" From 7a60bfa67736ad9fb4e8861c892de319d19bc4b6 Mon Sep 17 00:00:00 2001 From: po_taka Date: Fri, 1 Dec 2023 20:39:25 +0200 Subject: [PATCH 4/4] run script improvements --- run.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index c1ddfcf..979c518 100755 --- a/run.sh +++ b/run.sh @@ -13,6 +13,12 @@ docker-compose -p track build if [[ "$1" == "-p" ]]; then docker-compose -p track -f docker-compose.yml -f docker-compose-prod.yml build docker-compose -p track -f docker-compose.yml -f docker-compose-prod.yml up -else + exit +fi + +if [ $# -eq 0 ] + then docker-compose -p track up +else + docker-compose -p track "$@" fi