From e92efd3ab41d8c4210c42abf8d1d939c61085a02 Mon Sep 17 00:00:00 2001 From: dartrax Date: Fri, 25 Jun 2021 18:12:40 +0200 Subject: [PATCH] remove unnecessary files --- .editorconfig | 21 ------ docker/.env | 1 - docker/docker-compose.yml | 41 ------------ docker/php/Dockerfile | 43 ------------ docker/php/entrypoint | 42 ------------ docker/php/entrypoint-www-data | 119 --------------------------------- docker/server.sh | 3 - docker/shell.sh | 3 - scripts/create-tag.sh | 31 --------- 9 files changed, 304 deletions(-) delete mode 100644 .editorconfig delete mode 100644 docker/.env delete mode 100644 docker/docker-compose.yml delete mode 100644 docker/php/Dockerfile delete mode 100755 docker/php/entrypoint delete mode 100755 docker/php/entrypoint-www-data delete mode 100755 docker/server.sh delete mode 100755 docker/shell.sh delete mode 100755 scripts/create-tag.sh diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 499343b..0000000 --- a/.editorconfig +++ /dev/null @@ -1,21 +0,0 @@ -root = true - -[*] -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true -indent_style = tab -indent_size = 4 -charset = utf8 - -[*.{yml,yaml}] -indent_style = space -indent_size = 2 - -[{/docker/**,/js/dist/**}] -charset = none -end_of_line = none -insert_final_newline = none -trim_trailing_whitespace = none -indent_style = none -indent_size = none diff --git a/docker/.env b/docker/.env deleted file mode 100644 index 47aa2a7..0000000 --- a/docker/.env +++ /dev/null @@ -1 +0,0 @@ -COMPOSE_PROJECT_NAME=flarum_gravatar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 71d3ed2..0000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: '3' - -services: - - php: - build: - context: php - ports: - - '80:80' - - '443:443' - networks: - - webnet - volumes: - - ./vol/htdocs:/var/www/html - - ..:/flarum-packages/flarum-gravatar - environment: - FLARUM_DB_HOST: mysql - FLARUM_DB_USER: root - FLARUM_DB_PASS: toor - FLARUM_DB_NAME: flarum - FLARUM_DB_PREFIX: flpre_ - FLARUM_INSTALL_URL: 'https://flarum-gravatar.localhost' - FLARUM_INSTALL_TITLE: 'Test Flarum Site' - FLARUM_INSTALL_ADMIN_USER: admin - FLARUM_INSTALL_ADMIN_EMAIL: admin@example.com - FLARUM_INSTALL_ADMIN_PASS: nimda - FLARUM_CFG_DEBUG: 1 - - mysql: - image: mysql:5.7 - ports: - - '3306:3306' - networks: - - webnet - volumes: - - ./vol/mysql:/var/lib/mysql - environment: - MYSQL_ROOT_PASSWORD: toor - -networks: - webnet: diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile deleted file mode 100644 index 94f0c30..0000000 --- a/docker/php/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM php:7.4.13-apache - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - sudo \ - nano \ - unzip \ - git \ - ssl-cert \ - mariadb-client \ - iputils-ping \ - zlib1g-dev \ - libpng-dev \ - libjpeg-dev \ - libfreetype6-dev \ - libzip-dev \ - && \ - rm -r /var/lib/apt/lists/* && \ - docker-php-ext-configure gd --with-freetype --with-jpeg && \ - docker-php-ext-install -j "$(nproc)" \ - bcmath \ - exif \ - gd \ - mysqli \ - pdo_mysql \ - opcache \ - zip \ - && \ - a2enmod rewrite && \ - a2enmod ssl && \ - a2ensite default-ssl && \ - curl -L -s \ - -o /usr/local/bin/composer \ - https://getcomposer.org/download/2.0.8/composer.phar \ - && \ - chmod +x /usr/local/bin/composer - -COPY entrypoint entrypoint-www-data /usr/local/bin/ - -ENTRYPOINT ["entrypoint"] - -EXPOSE 80 -EXPOSE 443 diff --git a/docker/php/entrypoint b/docker/php/entrypoint deleted file mode 100755 index f4ddc02..0000000 --- a/docker/php/entrypoint +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# Install variables. -install_envs=( - FLARUM_DB_HOST - FLARUM_DB_USER - FLARUM_DB_PASS - FLARUM_DB_NAME - FLARUM_DB_PREFIX - FLARUM_INSTALL_URL - FLARUM_INSTALL_TITLE - FLARUM_INSTALL_ADMIN_USER - FLARUM_INSTALL_ADMIN_EMAIL - FLARUM_INSTALL_ADMIN_PASS -) - -# Check if variables set. -install_envs_set='1' -for e in "${install_envs[@]}"; do - if [[ -z "${!e}" ]]; then - echo "Missing environment variable: ${e}" - install_envs_set='0' - fi -done -if [[ "${install_envs_set}" != '1' ]]; then - echo 'Missing required environment variables, install aborted.' - exit 1 -fi - -# Run the www-data entrypoint. -sudo -u www-data -E entrypoint-www-data - -# Clear install environment variables. -for e in "${install_envs[@]}"; do - unset "${e}" -done - -# Run the apache entrypoint. -exec apache2-foreground "$@" diff --git a/docker/php/entrypoint-www-data b/docker/php/entrypoint-www-data deleted file mode 100755 index 595e63f..0000000 --- a/docker/php/entrypoint-www-data +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -flarum_version='v0.1.0-beta.15' - -flarum_config_json='/tmp/flarum.json' - -# Wait for and optionally create a MySQL table. -wait_for_mysql() { - TERM=dumb php -- "$1" "$2" "$3" "${4:-}" \ -<<'EOF' -connect_error) { - if (--$tries <= 0) { - exit(1); - } - sleep(3); - } -} -while ($mysql->connect_error); -if (!empty($table)) { - $table_esc = $mysql->real_escape_string($table); - if (!$mysql->query("CREATE DATABASE IF NOT EXISTS `{$table_esc}`")) { - echo $mysql->error, "\n"; - $mysql->close(); - exit(1); - } -} -$mysql->close(); -EOF -} - -# Install Flarum if not yet installed. -if [[ ! -d 'vendor' ]]; then - echo 'Installing Flarum: Starting' - - # Download Flarum. - composer create-project \ - --stability=beta \ - flarum/flarum \ - . \ - "${flarum_version}" - chmod +x flarum - - # Remove public directory from directory structure. - pushd public > /dev/null - for f in {.*,*}; do - if [[ "${f}" == '.' || "${f}" == '..' ]]; then - continue - fi - mv "${f}" "../${f}" - done - popd > /dev/null - rmdir public - sed -i "s/\/public//g" site.php - sed -i "s/\.\.\/site\.php/\.\/site\.php/g" index.php - sed -i "s/# RewriteRule /RewriteRule /g" .htaccess - - # Wait for the DB host to be ready, and ensure table exists. - wait_for_mysql \ - "${FLARUM_DB_HOST}" \ - "${FLARUM_DB_USER}" \ - "${FLARUM_DB_PASS}" \ - "${FLARUM_DB_NAME}" - - # Create the install config, run install, cleanup config. - TERM=dumb php -- "${flarum_config_json}" \ -<<'EOF' - false, - 'baseUrl' => $_ENV['FLARUM_INSTALL_URL'], - 'databaseConfiguration' => [ - 'driver' => 'mysql', - 'host' => $host, - 'port' => $port ? $port : 3306, - 'database' => $_ENV['FLARUM_DB_NAME'], - 'username' => $_ENV['FLARUM_DB_USER'], - 'password' => $_ENV['FLARUM_DB_PASS'], - 'prefix' => $_ENV['FLARUM_DB_PREFIX'] - ], - 'adminUser' => [ - 'username' => $_ENV['FLARUM_INSTALL_ADMIN_USER'], - 'password' => $_ENV['FLARUM_INSTALL_ADMIN_PASS'], - 'email' => $_ENV['FLARUM_INSTALL_ADMIN_EMAIL'] - ], - 'settings' => [ - 'forum_title' => $_ENV['FLARUM_INSTALL_TITLE'] - ] -], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n"); -EOF - ./flarum install -f "${flarum_config_json}" - rm "${flarum_config_json}" - - # Make config use ENV for debug. - sed -i \ - "s/'debug' => false/'debug' => filter_var\(\$_ENV\[\'FLARUM_CFG_DEBUG\'\] \?\? false, FILTER_VALIDATE_BOOLEAN\)/g" \ - 'config.php' - - # Install package. - composer config repositories.0 path '/flarum-packages/*' - composer require 'alexanderomara/flarum-gravatar' '*@dev' - - echo 'Installing Flarum: Complete' -fi diff --git a/docker/server.sh b/docker/server.sh deleted file mode 100755 index 8fa0575..0000000 --- a/docker/server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec docker-compose up --build diff --git a/docker/shell.sh b/docker/shell.sh deleted file mode 100755 index 785a1ff..0000000 --- a/docker/shell.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec docker-compose exec -u www-data php bash diff --git a/scripts/create-tag.sh b/scripts/create-tag.sh deleted file mode 100755 index eec73d8..0000000 --- a/scripts/create-tag.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -__self="${BASH_SOURCE[0]}" -__dir="$(cd "$(dirname "${__self}")" > /dev/null && pwd)" -__file="${__dir}/$(basename "${__self}")" - -if [[ "$#" -ne 1 ]]; then - echo "Usage: $0 " - exit 1 -fi - -version="$1" - -cd "${__dir}/../js" -rm -rf dist -npm run build -cd .. - -branch="$(git rev-parse --abbrev-ref HEAD)" -tmpbranch="tmp-tag-${version}" -message="Version ${version}" - -git checkout -b "${tmpbranch}" -git add -f js/dist/*.js js/dist/*.js.map -git commit -a -m "${message}" -git tag -a "${version}" -m "${message}" -git checkout "${branch}" -git branch -D "${tmpbranch}"