From 278055c8a26488fb503c871e01143e2743230c58 Mon Sep 17 00:00:00 2001 From: Matteo Gheza Date: Tue, 4 Jan 2022 11:57:16 +0100 Subject: [PATCH] Remove non-working files --- .dockerignore | 5 ---- .gitpod.yml | 73 ++++++++++++++++++++++----------------------- Dockerfile | 19 ------------ SECURITY.md | 21 ------------- docker-compose.yaml | 31 ------------------- supervisord.conf | 42 -------------------------- 6 files changed, 35 insertions(+), 156 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 SECURITY.md delete mode 100644 docker-compose.yaml delete mode 100644 supervisord.conf diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index daaf0dd..0000000 --- a/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -*/vendor -*.md -.git -config.php -config.old.php \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml index fdc95a8..0b289bd 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -8,47 +8,44 @@ ports: tasks: - name: Apache command: > - mkdir /tmp/apache; - touch /tmp/apache/error.log; - touch /tmp/apache/access.log; - export APACHE_PID_FILE="/tmp/apache/PID" APACHE_RUN_USER="gitpod" APACHE_RUN_GROUP="gitpod" APACHE_SERVER_NAME="localhost" APACHE_LOG_DIR="/tmp/apache"; - apache2; - multitail /tmp/apache/error.log -I /tmp/apache/access.log; + mkdir /tmp/apache; + touch /tmp/apache/error.log; + touch /tmp/apache/access.log; + export APACHE_PID_FILE="/tmp/apache/PID" APACHE_RUN_USER="gitpod" APACHE_RUN_GROUP="gitpod" APACHE_SERVER_NAME="localhost" APACHE_LOG_DIR="/tmp/apache"; + apache2; + multitail /tmp/apache/error.log -I /tmp/apache/access.log; - name: Allerta init: > - cd server; - composer install; - composer update; - cd resources; - npm install; - npm run prod; - cd ../.. - command: > - cd server/install; - WEBSERVER_URL=$(gp url 8001 | sed -E s/\\/$//); - mysql -e "CREATE DATABASE IF NOT EXISTS allerta"; - mysql -e "CREATE USER 'allerta'@'localhost' IDENTIFIED BY 'allerta_pwd';"; - mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'allerta'@'localhost';"; - mysqladmin reload; - php install.php config -n "allerta" -u "allerta" -a "allerta_pwd" -o "127.0.0.1" -r "DEV_ENV"; - php install.php populate -m "admin" -b -d -s "password" -w "owner" -e "mail@mailserver.local" -u "$WEBSERVER_URL/"; - touch runInstall.php; - gp await-port 8001; gp preview "$(gp url 8001)"; - cd ..; - wget https://github.com/vrana/adminer/releases/download/v4.8.0/adminer-4.8.0.php; - mv adminer-4.8.0.php adminer.php; - clear; - echo "$(tput setaf 2)Full webserver url$(tput sgr0) $(tput setaf 4)$WEBSERVER_URL$(tput sgr0)"; - echo "$(tput setaf 2)Allerta username$(tput sgr0) $(tput setaf 4)admin$(tput sgr0)"; - echo "$(tput setaf 2)Allerta password$(tput sgr0) $(tput setaf 4)password$(tput sgr0)"; - echo "$(tput setaf 2)PHP Adminer$(tput sgr0) $(tput setaf 4)$WEBSERVER_URL/adminer.php$(tput sgr0)"; - echo "$(tput setaf 2)DB user$(tput sgr0) $(tput setaf 4)allerta$(tput sgr0)"; - echo "$(tput setaf 2)DB password$(tput sgr0) $(tput setaf 4)allerta_pwd$(tput sgr0)"; - echo "$(tput setaf 2)DB name$(tput sgr0) $(tput setaf 4)allerta$(tput sgr0)"; - printf "\n"; - echo "Good luck. Happy coding and testing!" + cd frontend; + npm install; + npm run build; + cd ../backend; + composer install; + # command: > + # cd server/install; + # WEBSERVER_URL=$(gp url 8001 | sed -E s/\\/$//); + # mysql -e "CREATE DATABASE IF NOT EXISTS allerta"; + # mysql -e "CREATE USER 'allerta'@'localhost' IDENTIFIED BY 'allerta_pwd';"; + # mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'allerta'@'localhost';"; + # mysqladmin reload; + # php install.php config -n "allerta" -u "allerta" -a "allerta_pwd" -o "127.0.0.1" -r "DEV_ENV"; + # php install.php populate -m "admin" -b -d -s "password" -w "owner" -e "mail@mailserver.local" -u "$WEBSERVER_URL/"; + # touch runInstall.php; + # gp await-port 8001; gp preview "$(gp url 8001)"; + # cd ..; + # wget https://github.com/vrana/adminer/releases/download/v4.8.0/adminer-4.8.0.php; + # mv adminer-4.8.0.php adminer.php; + # clear; + # echo "$(tput setaf 2)Full webserver url$(tput sgr0) $(tput setaf 4)$WEBSERVER_URL$(tput sgr0)"; + # echo "$(tput setaf 2)Allerta username$(tput sgr0) $(tput setaf 4)admin$(tput sgr0)"; + # echo "$(tput setaf 2)Allerta password$(tput sgr0) $(tput setaf 4)password$(tput sgr0)"; + # echo "$(tput setaf 2)PHP Adminer$(tput sgr0) $(tput setaf 4)$WEBSERVER_URL/adminer.php$(tput sgr0)"; + # echo "$(tput setaf 2)DB user$(tput sgr0) $(tput setaf 4)allerta$(tput sgr0)"; + # echo "$(tput setaf 2)DB password$(tput sgr0) $(tput setaf 4)allerta_pwd$(tput sgr0)"; + # echo "$(tput setaf 2)DB name$(tput sgr0) $(tput setaf 4)allerta$(tput sgr0)"; + # printf "\n"; + # echo "Good luck. Happy coding and testing!" vscode: extensions: - gruntfuggly.todo-tree@0.0.205:sbsZJOTJzKZtMVHQuS2iPw== - shelex.vscode-cy-helper@1.1.0:U9ok2y1bSmqn17OMuRMOfw== - - hookyqr.beautify@1.4.11:n9DJEUFbYD/YHaBXxm+pYw== \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b52951e..0000000 --- a/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM trafex/alpine-nginx-php7:2.1.0 AS webserver - -LABEL maintainer="matteo@matteogheza.it" -LABEL version="1.0" -LABEL description="Docker project for open source firefighter management software" - -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY ./server /var/www/html -COPY --from=composer /usr/bin/composer /usr/bin/composer - -WORKDIR /var/www/html -USER root -RUN apk add --no-cache bash sed php-pdo php-pdo_mysql php-pdo_sqlite php-pdo_pgsql git -RUN composer install --no-dev --optimize-autoloader --no-interaction --no-progress - -#RUN echo "@reboot cd /var/www/html/install && php install.php config" > /etc/crontabs/root - -USER nobody -EXPOSE 8080 diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 034e848..0000000 --- a/SECURITY.md +++ /dev/null @@ -1,21 +0,0 @@ -# Security Policy - -## Supported Versions - -Use this section to tell people about which versions of your project are -currently being supported with security updates. - -| Version | Supported | -| ------- | ------------------ | -| 5.1.x | :white_check_mark: | -| 5.0.x | :x: | -| 4.0.x | :white_check_mark: | -| < 4.0 | :x: | - -## Reporting a Vulnerability - -Use this section to tell people how to report a vulnerability. - -Tell them where to go, how often they can expect to get an update on a -reported vulnerability, what to expect if the vulnerability is accepted or -declined, etc. diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index d4e9c7b..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,31 +0,0 @@ -version: '3.3' - -services: - db: - image: mariadb:latest - command: --default-authentication-plugin=mysql_native_password - volumes: - - db_data:/var/lib/mysql - restart: always - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_USER: allerta - MYSQL_PASSWORD: password - MYSQL_DATABASE: allerta-db - allerta: - depends_on: - - db - links: - - db:db - image: allertavvf/allertavvf - build: ./ - ports: - - "8081:8080" - restart: always - environment: - DB_HOST: db - DB_USERNAME: root - DB_PASSWORD: root - DB_NAME: allerta-db -volumes: - db_data: {} \ No newline at end of file diff --git a/supervisord.conf b/supervisord.conf deleted file mode 100644 index e435433..0000000 --- a/supervisord.conf +++ /dev/null @@ -1,42 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/dev/null -logfile_maxbytes=0 -pidfile=/run/supervisord.pid - -[program:php-fpm] -command=php-fpm7 -F -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -autorestart=false -startretries=0 - -[program:nginx] -command=nginx -g 'daemon off;' -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -autorestart=false -startretries=0 - -[program:crond] -command=crond -f -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -autorestart=false -startretries=0 - -[program:configurator] -command=sh -c "sleep 3;php install.php config" -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -autorestart=false -startretries=0 -directory=/var/www/html/install \ No newline at end of file