Commit 51235966 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed prometheus dependency

parent 9c6b477f
......@@ -19,7 +19,6 @@ npm-debug.log
/.buildpath
/.project
composer.lock
package-lock.json
local.log
......
......@@ -64,21 +64,6 @@ prepare_node:
- branches
- tags
prepare_composer:
stage: prepare
image: registry.metager.de/open-source/composer/master
variables:
COMPOSER_HOME: "$CI_PROJECT_DIR/.composer"
script:
- composer install --no-dev
artifacts:
paths:
- vendor
cache:
key: "metager-${CI_JOB_NAME}"
paths:
- .composer
review:
variables:
HELM_UPGRADE_VALUES_FILE: .gitlab/review-apps-values.yaml
......
......@@ -66,6 +66,11 @@ COPY config/nginx-default.conf /etc/nginx/sites-available/default
RUN sed -i 's/fastcgi_pass phpfpm:9000;/fastcgi_pass localhost:9000;/g' /etc/nginx/sites-available/default
COPY --chown=root:www-data . /html
COPY ./helpers/installComposer.sh /usr/bin/installComposer
RUN chmod +x /usr/bin/installComposer && \
/usr/bin/installComposer && \
rm /usr/bin/installComposer
WORKDIR /html
EXPOSE 80
......@@ -76,5 +81,6 @@ CMD cp /root/.env .env && \
chown -R root:www-data storage/logs/metager bootstrap/cache && \
chmod -R g+w storage/logs/metager bootstrap/cache && \
cron -L /dev/stdout && \
composer install --now-dev && \
php artisan spam:load && \
php-fpm7.4
......@@ -60,7 +60,14 @@ RUN mkdir -p /run/php && \
WORKDIR /html
EXPOSE 80
COPY ./helpers/installComposer.sh /usr/bin/installComposer
RUN chmod +x /usr/bin/installComposer && \
/usr/bin/installComposer && \
rm /usr/bin/installComposer
CMD chown -R root:www-data storage/logs/metager bootstrap/cache && \
chmod -R g+w storage/logs/metager bootstrap/cache && \
cron -L /dev/stdout && \
composer install && \
php-fpm7.4
......@@ -2,4 +2,5 @@ README.md
CHANGELOG.md
vendor/*
node_modules/*
storage/logs/*
\ No newline at end of file
storage/logs/*
helpers/*
\ No newline at end of file
......@@ -11,14 +11,14 @@
"php": "^7.3|^8.0",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"globalcitizen/php-iban": "^4.0.0",
"guzzlehttp/guzzle": "^7.0.1",
"jenssegers/agent": "^2.6",
"laravel/framework": "^8.40",
"laravel/tinker": "^2.5",
"endclothing/prometheus_client_php": "^1.0",
"globalcitizen/php-iban": "^4.0.0",
"jenssegers/agent": "^2.6",
"mcamara/laravel-localization": "1.6.*",
"mews/captcha": "^3.2.6",
"promphp/prometheus_client_php": "^2.2",
"symfony/dom-crawler": "^5.2"
},
"require-dev": {
......@@ -68,4 +68,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
\ No newline at end of file
}
This diff is collapsed.
......@@ -3,6 +3,8 @@
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use DB;
use Hash;
class UsersSeeder extends Seeder
{
......
version: '3.7'
services:
phpdeps:
image: prooph/composer:7.3
volumes:
- .:/app
command: install
assets:
image: node:10
volumes:
......@@ -35,7 +30,6 @@ services:
depends_on:
- "mgdb"
- "dependencies"
- "phpdeps"
- "assets"
- "redis"
restart: on-failure
......
#!/bin/sh
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
then
>&2 echo 'ERROR: Invalid installer checksum'
rm composer-setup.php
exit 1
fi
php composer-setup.php --install-dir=/usr/bin --filename=composer --quiet
RESULT=$?
rm composer-setup.php
exit $RESULT
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment