diff --git a/.env.example b/.env.example index ef1eb9c..a5104ad 100644 --- a/.env.example +++ b/.env.example @@ -18,7 +18,7 @@ ADMINER_PORT=3000 ADMINER_HOST=172.28.1.12 #elasticsearch -ELASTICSEARCH_PORT=9300 +ELASTICSEARCH_PORT=9400 ELASTICSEARCH_DATA=./elasticsearch_data ELASTICSEARCH_HOST=172.28.1.11 @@ -29,9 +29,17 @@ ELASTICHQ_HOST=172.28.1.10 #MONGODB MONGODB_HOST=172.28.1.8 -MONGODB_PORT=37017 +MONGODB_PORT=27017 MONGODB_USER=user MONGODB_PASS=pass +MONGODB32_HOST=172.28.1.15 +MONGODB32_PORT=37017 +MONGODB42_HOST=172.28.1.16 +MONGODB42_PORT=47017 +MONGODB60_HOST=172.28.1.17 +MONGODB60_PORT=57017 +MONGODB80_HOST=172.28.1.18 +MONGODB80_PORT=67017 #POSTGRES POSTGRES_HOST=172.28.1.7 @@ -82,7 +90,7 @@ GRAYLOG_PORT=9000 GRAYLOG_URL=http://192.168.36.240:9000/ #ELASTIC_GRAYLOG -ELASTIC_GRAYLOG_PORT=9200 +ELASTIC_GRAYLOG_PORT=9300 ELASTIC_GRAYLOG_DATA=./elastic_graylog_data ELASTIC_GRAYLOG_HOST=172.28.1.17 @@ -106,4 +114,40 @@ SENTRY_SECRET_KEY=***YOUR_SECRET_KEY*** KAFDROP_PORT=9001 #SONARQUBE -SONARQUBE_PORT=9095 \ No newline at end of file +SONARQUBE_PORT=9095 + +#PROMETHEUS +PROMETHEUS_PORT=9090 + +#KEYCLOAK +KEYCLOAK_PORT=8091 +KC_DB_URL=jdbc:postgresql://internal_postgres:port/db +KC_DB=postgresql +KC_DB_USERNAME=postgres +KC_DB_PASSWORD=postgres +KEYCLOAK_ADMIN_PASSWORD=admin + + +#SSH_UI +SSH_UI_PORT=2222 + +#PGBOUNCER +PGBOUNCER_PORT=7432 +PG_POSTGRES_HOST=192.168.36.240 +PG_POSTGRES_PORT=5432 +PG_POSTGRES_DB=logistic +PG_POSTGRES_USER=postgres +PG_POSTGRES_PASSWORD=postgres +PGBOUNCER_AUTH_TYPE=md5 +PGBOUNCER_POOL_MODE=session + +#PROXYSQL +PROXYSQL_PORT=6533 +PROXYSQL_ADMIN_PORT=6532 + +# Elasticsearch 8.0 +ELASTICSEARCH80_HOST=172.28.1.80 +ELASTICSEARCH80_PORT=9200 + +# Supervisor +SUPERVISOR_PORT=9002 \ No newline at end of file diff --git a/.github/workflows/docker-image-php72-xdebug.yml b/.github/workflows/docker-image-php72-xdebug.yml index 4ce2469..e6acbba 100644 --- a/.github/workflows/docker-image-php72-xdebug.yml +++ b/.github/workflows/docker-image-php72-xdebug.yml @@ -20,18 +20,23 @@ jobs: - uses: actions/checkout@v3 name: Checkout - - - name: ls -la - run: ls -la - - - uses: docker/login-action@v2 + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-docker-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-docker- + + - uses: docker/login-action@v2 name: Login to Docker Hub with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v2 name: Setup buildx - name: Build the php72_xdebug - run: docker buildx build --platform linux/amd64,linux/arm64 -t onuragtas/php7.2-fpm-xdebug:latest --push ./php72_xdebug/. + run: docker buildx build --platform linux/amd64,linux/arm64 --cache-from=type=registry,ref=onuragtas/php7.2-fpm-xdebug:latest -t onuragtas/php7.2-fpm-xdebug:latest --push --debug ./php72_xdebug/. diff --git a/.github/workflows/docker-image-php72.yml b/.github/workflows/docker-image-php72.yml index 4af2744..cb0680a 100644 --- a/.github/workflows/docker-image-php72.yml +++ b/.github/workflows/docker-image-php72.yml @@ -20,11 +20,16 @@ jobs: - uses: actions/checkout@v3 name: Checkout - - - name: ls -la - run: ls -la - - - uses: docker/login-action@v2 + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-docker-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-docker- + + - uses: docker/login-action@v2 name: Login to Docker Hub with: username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -34,5 +39,4 @@ jobs: name: Setup buildx - name: Build the php72 - run: docker buildx build --platform linux/amd64,linux/arm64 -t onuragtas/php7.2-fpm:latest --push ./php72/. - + run: docker buildx build --platform linux/amd64,linux/arm64 --cache-from=type=registry,ref=onuragtas/php7.2-fpm:latest -t onuragtas/php7.2-fpm:latest --push --debug ./php72/. diff --git a/.github/workflows/docker-image-php84-xdebug.yml b/.github/workflows/docker-image-php84-xdebug.yml new file mode 100644 index 0000000..903f9a6 --- /dev/null +++ b/.github/workflows/docker-image-php84-xdebug.yml @@ -0,0 +1,37 @@ +name: Docker Image CI PHP84_Xdebug + +on: + push: + branches: [ "master" ] + paths: + - 'php84_xdebug/**' + pull_request: + branches: [ "master" ] + paths: + - 'php84_xdebug/**' + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - + uses: actions/checkout@v3 + name: Checkout + - + name: ls -la + run: ls -la + - + uses: docker/login-action@v2 + name: Login to Docker Hub + with: + username: ${{ secrets.DOCKERHUB_USERNAME_DEVENV }} + password: ${{ secrets.DOCKERHUB_TOKEN_DEVENV }} + - + uses: docker/setup-buildx-action@v2 + name: Setup buildx + - + name: Build the php84_xdebug + run: docker buildx build --platform linux/amd64,linux/arm64 -t hakanbaysal/php8.4-fpm-xdebug:latest --push ./php84_xdebug/. diff --git a/.gitignore b/.gitignore index 2820267..3471db3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ postgres/* logs/* Ssl/* mongo/* +mongo32/* +mongo42/* +mongo60/* +mongo80/* pgadmin/* logs/access.log logs/error.log @@ -22,5 +26,14 @@ elastic_graylog_data/* elasticsearch_data/* arangodb_data_container/* arangodb_apps_data_container/* -.idea/workspace.xml -.idea \ No newline at end of file +.idea +etc/prometheus.yml +grafana/datasource.yml +devenv.json +saved_commands.json +fix_metadata.py +keycloak_data +keycloak_providers +docker.iml +data/* +supervisor/conf/* \ No newline at end of file diff --git a/.idea/docker.iml b/.idea/docker.iml deleted file mode 100644 index 2e3f18d..0000000 --- a/.idea/docker.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1e19273..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 947f6e8..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 5a638f2..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.go.format.on.save.advertiser.fired": "true", - "RunOnceActivity.go.formatter.settings.were.checked": "true", - "RunOnceActivity.go.migrated.go.modules.settings": "true", - "SONARLINT_PRECOMMIT_ANALYSIS": "true", - "WebServerToolWindowFactoryState": "false", - "dart.analysis.tool.window.visible": "false", - "go.import.settings.migrated": "true", - "last_opened_file_path": "/Users/onuragtas/docker", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "ruby.rails.projectView.checked": "true", - "show.migrate.to.gradle.popup": "false", - "vue.rearranger.settings.migration": "true" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - -