From 3d73e639c848f90269f97ec326e654498f6e7408 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 23 Sep 2023 23:08:11 +0300 Subject: [PATCH 001/158] rvm and ruby added --- devenv/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 83b66bf..d172c98 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -59,6 +59,14 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | b RUN export NVM_DIR="$HOME/.nvm" RUN . $HOME/.nvm/nvm.sh +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +RUN curl -sSL get.rvm.io | bash -s stable --ruby +RUN echo '[[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function' >> ~/.bashrc +# +RUN rvm install 2.2.0 +RUN rvm --default use 2.2.0 +RUN ruby -v + EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 RUN mkdir /sites From dcf1a0dd0c5157d04fbebee97c65fa3612d91c0b Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 23 Sep 2023 23:18:37 +0300 Subject: [PATCH 002/158] rvm and ruby disabled --- devenv/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index d172c98..c36d4b3 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -59,9 +59,9 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | b RUN export NVM_DIR="$HOME/.nvm" RUN . $HOME/.nvm/nvm.sh -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -RUN curl -sSL get.rvm.io | bash -s stable --ruby -RUN echo '[[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function' >> ~/.bashrc +#RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +#RUN curl -sSL get.rvm.io | bash -s stable --ruby +#RUN echo '[[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function' >> ~/.bashrc # RUN rvm install 2.2.0 RUN rvm --default use 2.2.0 From c295cc0995101041cb605e5c86e64470c4ca70d1 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 23 Sep 2023 23:24:17 +0300 Subject: [PATCH 003/158] rvm and ruby disabled --- devenv/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index c36d4b3..239008f 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -63,9 +63,9 @@ RUN . $HOME/.nvm/nvm.sh #RUN curl -sSL get.rvm.io | bash -s stable --ruby #RUN echo '[[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function' >> ~/.bashrc # -RUN rvm install 2.2.0 -RUN rvm --default use 2.2.0 -RUN ruby -v +#RUN rvm install 2.2.0 +#RUN rvm --default use 2.2.0 +#RUN ruby -v EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From ae0cc56cbff0ea55f23abddf3fcf9f39a4c9ed4d Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 23 Sep 2023 23:43:30 +0300 Subject: [PATCH 004/158] rvm and ruby enabled --- devenv/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 239008f..34b6aa3 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -59,13 +59,10 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | b RUN export NVM_DIR="$HOME/.nvm" RUN . $HOME/.nvm/nvm.sh -#RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -#RUN curl -sSL get.rvm.io | bash -s stable --ruby -#RUN echo '[[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function' >> ~/.bashrc -# -#RUN rvm install 2.2.0 -#RUN rvm --default use 2.2.0 -#RUN ruby -v +RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer +RUN chmod +x /usr/local/bin/rvm-installer +RUN /usr/local/rvm/bin/rvm install 2.2.10 +RUN [[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm" EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From d8c3ff52b5426b40898382a6a6d8ea19ff295cd0 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:00:58 +0300 Subject: [PATCH 005/158] rvm and ruby enabled --- devenv/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 34b6aa3..f28f724 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -61,8 +61,9 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer -RUN /usr/local/rvm/bin/rvm install 2.2.10 +RUN /usr/local/bin/rvm-installer RUN [[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm" +RUN /usr/local/rvm/bin/rvm install 2.2.10 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From 163cce233360b992fe5003a00cd5b1dd21f95c1c Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:07:51 +0300 Subject: [PATCH 006/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index f28f724..f426ecf 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,7 +62,7 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer -RUN [[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm" +RUN source "/usr/local/rvm/scripts/rvm" RUN /usr/local/rvm/bin/rvm install 2.2.10 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From 47a816e03d3f5fff1e079b1f6d8ccb731543bec4 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:13:22 +0300 Subject: [PATCH 007/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index f426ecf..fd7b231 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,7 +62,7 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer -RUN source "/usr/local/rvm/scripts/rvm" +RUN source /usr/local/rvm/scripts/rvm RUN /usr/local/rvm/bin/rvm install 2.2.10 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From 12ca965186278c9b5da3f7504120a1795581a38b Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:22:16 +0300 Subject: [PATCH 008/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index fd7b231..8803603 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,7 +62,7 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer -RUN source /usr/local/rvm/scripts/rvm +RUN #source /usr/local/rvm/scripts/rvm RUN /usr/local/rvm/bin/rvm install 2.2.10 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From b620262d1203c1a369dc7c4229ab703d086c4271 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:29:18 +0300 Subject: [PATCH 009/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 8803603..d9d152b 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -63,7 +63,7 @@ RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rv RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer RUN #source /usr/local/rvm/scripts/rvm -RUN /usr/local/rvm/bin/rvm install 2.2.10 +RUN /usr/local/rvm/bin/rvm install 3.2.2 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From 99543515ec2d561d07cfa06927b63b2cf5ba4446 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 00:49:20 +0300 Subject: [PATCH 010/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index d9d152b..80414fb 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,7 +62,7 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer -RUN #source /usr/local/rvm/scripts/rvm +RUN source /etc/profile.d/rvm.sh RUN /usr/local/rvm/bin/rvm install 3.2.2 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From 644f73db8d03744a6a01fbf4527995992eb16226 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 24 Sep 2023 01:01:39 +0300 Subject: [PATCH 011/158] rvm and ruby enabled --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 80414fb..94f2f6e 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,7 +62,7 @@ RUN . $HOME/.nvm/nvm.sh RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer RUN chmod +x /usr/local/bin/rvm-installer RUN /usr/local/bin/rvm-installer -RUN source /etc/profile.d/rvm.sh +RUN #source /etc/profile.d/rvm.sh RUN /usr/local/rvm/bin/rvm install 3.2.2 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From ef031f0e4a55064a8c57284d43163a4cacdca893 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 26 Sep 2023 15:30:19 +0300 Subject: [PATCH 012/158] mysql version changed --- docker-compose.yml.amd64.dist | 2 +- docker-compose.yml.arm64.dist | 2 +- docker-compose.yml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 30ccd14..9ee7dd2 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -290,7 +290,7 @@ services: - ${REDIS_PORT}:6379 db: - image: 'mysql:8.0' + image: 'mysql:8.0.34' container_name: db restart: always networks: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 90c1655..0df1e46 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -290,7 +290,7 @@ services: - ${REDIS_PORT}:6379 db: - image: 'mysql:8.0' + image: 'mysql:8.0.34' container_name: db restart: always networks: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index a0f2132..fe89983 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -290,7 +290,7 @@ services: - ${REDIS_PORT}:6379 db: - image: 'mysql:8.0' + image: 'mysql:8.0.34' container_name: db restart: always networks: From 6d33dabf25abf517b7a8eb304ba338068c0078f7 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Thu, 28 Sep 2023 21:49:43 +0300 Subject: [PATCH 013/158] rabbitmq changed --- docker-compose.yml.amd64.dist | 4 ++-- docker-compose.yml.arm64.dist | 4 ++-- docker-compose.yml.dist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 9ee7dd2..f4feb54 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -77,8 +77,8 @@ services: - ${RABBITMQ_PORT2}:5672 volumes: - ./rabbitmq_data:/var/lib/rabbitmq/mnesia - - ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins - - ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins + #- ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins + #- ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins networks: net: ipv4_address: ${RABBITMQ_HOST} diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 0df1e46..628c940 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -77,8 +77,8 @@ services: - ${RABBITMQ_PORT2}:5672 volumes: - ./rabbitmq_data:/var/lib/rabbitmq/mnesia - - ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins - - ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins + #- ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins + #- ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins networks: net: ipv4_address: ${RABBITMQ_HOST} diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index fe89983..f4463a9 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -77,8 +77,8 @@ services: - ${RABBITMQ_PORT2}:5672 volumes: - ./rabbitmq_data:/var/lib/rabbitmq/mnesia - - ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins - - ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins + #- ./rabbitmq_enabled_plugins:/etc/rabbitmq/enabled_plugins + #- ./rabbitmq_plugins:/usr/lib/rabbitmq/plugins networks: net: ipv4_address: ${RABBITMQ_HOST} From 4bc252e7e0d2dfa9bad176afb3f9df296226ab39 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 14 Oct 2023 20:11:01 +0300 Subject: [PATCH 014/158] Update Dockerfile --- devenv/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 94f2f6e..e10b9d4 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -41,6 +41,9 @@ RUN chmod +x /usr/local/bin/redock RUN wget https://gist.githubusercontent.com/onuragtas/c6dddddd6a8e6b8663f4f0043fec052a/raw/eedfc5500af08a04099ad4eb51b5142c996db7fc/go-compiler.sh -O /usr/local/bin/go-compiler.sh -F RUN chmod +x /usr/local/bin/go-compiler.sh +RUN wget https://github.com/onuragtas/deployment/releases/latest/download/deployment_linux_amd64 -O /usr/local/bin/deployment +RUN chmod +x /usr/local/bin/deployment + RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php81_xdebug \$@" >> /usr/local/bin/php81_container && chmod +x /usr/local/bin/php81_container RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php74_xdebug \$@" >> /usr/local/bin/php74_container && chmod +x /usr/local/bin/php74_container RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php72_xdebug \$@" >> /usr/local/bin/php72_container && chmod +x /usr/local/bin/php72_container @@ -71,4 +74,4 @@ RUN mkdir /sites WORKDIR /sites CMD ["/usr/sbin/sshd", "-D"] -ENTRYPOINT echo "root:${PASSWORD}" | chpasswd && service ssh restart && cron && cd /sites && bash && dockerd \ No newline at end of file +ENTRYPOINT echo "root:${PASSWORD}" | chpasswd && service ssh restart && cron && cd /sites && bash && dockerd From f9b96b39745a4ec558299bb6513f8b5c2bfc5586 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 15 Oct 2023 00:39:57 +0300 Subject: [PATCH 015/158] Update Dockerfile --- devenv/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index e10b9d4..979eb24 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -75,3 +75,4 @@ WORKDIR /sites CMD ["/usr/sbin/sshd", "-D"] ENTRYPOINT echo "root:${PASSWORD}" | chpasswd && service ssh restart && cron && cd /sites && bash && dockerd + From 918a709412977de04f85186fdb3c1fcd64c1e6fc Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 15 Oct 2023 01:10:30 +0300 Subject: [PATCH 016/158] Update Dockerfile --- devenv/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 979eb24..f473299 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -62,11 +62,11 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | b RUN export NVM_DIR="$HOME/.nvm" RUN . $HOME/.nvm/nvm.sh -RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer -RUN chmod +x /usr/local/bin/rvm-installer -RUN /usr/local/bin/rvm-installer -RUN #source /etc/profile.d/rvm.sh -RUN /usr/local/rvm/bin/rvm install 3.2.2 +#RUN wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer -O /usr/local/bin/rvm-installer +#RUN chmod +x /usr/local/bin/rvm-installer +#RUN /usr/local/bin/rvm-installer +#RUN #source /etc/profile.d/rvm.sh +#RUN /usr/local/rvm/bin/rvm install 3.2.2 EXPOSE 22 80 443 8090 9000 9001 9002 9003 9004 9005 9006 9007 9008 9010 From e06353c8ab302db851224c25410a92a610b2f7fd Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 15 Oct 2023 04:09:32 +0300 Subject: [PATCH 017/158] Update Dockerfile --- devenv/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index f473299..67da25e 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -75,4 +75,3 @@ WORKDIR /sites CMD ["/usr/sbin/sshd", "-D"] ENTRYPOINT echo "root:${PASSWORD}" | chpasswd && service ssh restart && cron && cd /sites && bash && dockerd - From ea52cb01fbab162e250ddd4aa6d5792a2a09af47 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 18 Oct 2023 18:48:55 +0300 Subject: [PATCH 018/158] Update Dockerfile --- php72_xdebug/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index 0576ca6..0b161a3 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -30,6 +30,7 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di && pecl install memcached-3.0.0 \ && pecl install mongodb-1.9.1 \ && pecl install yaml \ + && pecl install grpc \ && docker-php-ext-install \ curl \ iconv \ From df77545e3ded50204ee3c28e43e4b0e29eb3e5d2 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 18 Oct 2023 18:48:59 +0300 Subject: [PATCH 019/158] Update Dockerfile --- php72/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php72/Dockerfile b/php72/Dockerfile index 3a3f225..12dca2f 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -30,6 +30,7 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di && pecl install memcached-3.0.0 \ && pecl install mongodb \ && pecl install yaml \ + && pecl install grpc \ && docker-php-ext-install \ curl \ iconv \ From 1d1eb5b3c3e27e1df262af73b827cccf0b05aa5b Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 23 Oct 2023 16:18:58 +0300 Subject: [PATCH 020/158] Update Dockerfile --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 67da25e..cf94a5c 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM ubuntu:latest LABEL maintainer="hakanbysl@gmail.com" ENV DEBIAN_FRONTEND noninteractive From dffb1c53de35c718930ac011ef17c8e1eadfb1c3 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 23 Oct 2023 16:23:24 +0300 Subject: [PATCH 021/158] Update Dockerfile --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index cf94a5c..67da25e 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM debian:latest LABEL maintainer="hakanbysl@gmail.com" ENV DEBIAN_FRONTEND noninteractive From 509e7ce24eab30389364ba8b83148f24982b93af Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 23 Oct 2023 16:38:37 +0300 Subject: [PATCH 022/158] image debian to ubuntu --- devenv/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 67da25e..01d473f 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM ubuntu:latest LABEL maintainer="hakanbysl@gmail.com" ENV DEBIAN_FRONTEND noninteractive @@ -28,7 +28,11 @@ RUN apt-get update && apt-get install -y openssh-server \ cron \ rsync -RUN apt-get update && apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -y && apt-get install ca-certificates curl gnupg lsb-release && mkdir -p /etc/apt/keyrings && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && apt-get update && chmod a+r /etc/apt/keyrings/docker.gpg && apt-get update && apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y && apt-get install docker-compose -y && docker --version && docker-compose --version +RUN apt-get update && apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -y && apt-get install ca-certificates curl gnupg lsb-release && mkdir -p /etc/apt/keyrings +RUN apt install apt-transport-https ca-certificates curl software-properties-common +RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - +RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable" +RUN apt install docker docker-compose -y RUN wget https://gist.githubusercontent.com/onuragtas/74f8351c4496598badbd9399814a44a5/raw/ci.sh -O /usr/local/bin/ci.sh RUN chmod +x /usr/local/bin/ci.sh From fd4c8188942a37430631db778fc6c91ad623f45b Mon Sep 17 00:00:00 2001 From: onuragtas Date: Fri, 3 Nov 2023 13:55:47 +0300 Subject: [PATCH 023/158] image debian to ubuntu --- httpd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 9eb3966..2f24a1e 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y --force-yes nano unzip wget curl RUN apt-get update && apt-get install -y --force-yes apache2 && apt-get clean -RUN a2enmod proxy_http && a2enmod rewrite && a2enmod proxy_fcgi && a2enmod headers +RUN a2enmod proxy_http && a2enmod rewrite && a2enmod proxy_fcgi && a2enmod headers && a2enmod vhost_alias EXPOSE 80 From 1d47208966399ab406fe2d4b48422fc3cbf38b65 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 13 Dec 2023 13:35:39 +0300 Subject: [PATCH 024/158] php command changed --- devenv/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 01d473f..982c247 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -48,14 +48,14 @@ RUN chmod +x /usr/local/bin/go-compiler.sh RUN wget https://github.com/onuragtas/deployment/releases/latest/download/deployment_linux_amd64 -O /usr/local/bin/deployment RUN chmod +x /usr/local/bin/deployment -RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php81_xdebug \$@" >> /usr/local/bin/php81_container && chmod +x /usr/local/bin/php81_container -RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php74_xdebug \$@" >> /usr/local/bin/php74_container && chmod +x /usr/local/bin/php74_container -RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php72_xdebug \$@" >> /usr/local/bin/php72_container && chmod +x /usr/local/bin/php72_container -RUN echo "docker -H 192.168.36.240:4243 exec -it -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php56_xdebug \$@" >> /usr/local/bin/php56_container && chmod +x /usr/local/bin/php56_container -RUN echo "docker -H 192.168.36.240:4243 exec -it postgres \$@" >> /usr/local/bin/postgres_container && chmod +x /usr/local/bin/postgres_container -RUN echo "docker -H 192.168.36.240:4243 exec -it mongo \$@" >> /usr/local/bin/mongo_container && chmod +x /usr/local/bin/mongo_container -RUN echo "docker -H 192.168.36.240:4243 exec -it db \$@" >> /usr/local/bin/mysql_container && chmod +x /usr/local/bin/mysql_container -RUN echo "docker -H 192.168.36.240:4243 exec -it nginx \$@" >> /usr/local/bin/nginx_container && chmod +x /usr/local/bin/nginx_container +RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php81_xdebug \$@" >> /usr/local/bin/php81_container && chmod +x /usr/local/bin/php81_container +RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php74_xdebug \$@" >> /usr/local/bin/php74_container && chmod +x /usr/local/bin/php74_container +RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php72_xdebug \$@" >> /usr/local/bin/php72_container && chmod +x /usr/local/bin/php72_container +RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php56_xdebug \$@" >> /usr/local/bin/php56_container && chmod +x /usr/local/bin/php56_container +RUN echo "docker -H 192.168.36.240:4243 exec postgres \$@" >> /usr/local/bin/postgres_container && chmod +x /usr/local/bin/postgres_container +RUN echo "docker -H 192.168.36.240:4243 exec mongo \$@" >> /usr/local/bin/mongo_container && chmod +x /usr/local/bin/mongo_container +RUN echo "docker -H 192.168.36.240:4243 exec db \$@" >> /usr/local/bin/mysql_container && chmod +x /usr/local/bin/mysql_container +RUN echo "docker -H 192.168.36.240:4243 exec nginx \$@" >> /usr/local/bin/nginx_container && chmod +x /usr/local/bin/nginx_container ENV PASSWORD=password From cffdba3e5f1e41b39aa6efc7dbbac7baec64f594 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 13 Dec 2023 14:10:02 +0300 Subject: [PATCH 025/158] devenv golang version changed --- devenv/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 982c247..e5291e0 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -10,7 +10,6 @@ RUN apt-get update && apt-get install -y openssh-server \ curl \ gnupg-agent \ software-properties-common \ - golang-go \ default-jdk \ nginx \ nodejs \ @@ -48,6 +47,10 @@ RUN chmod +x /usr/local/bin/go-compiler.sh RUN wget https://github.com/onuragtas/deployment/releases/latest/download/deployment_linux_amd64 -O /usr/local/bin/deployment RUN chmod +x /usr/local/bin/deployment +RUN wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz -O /usr/local/go.linux-amd64.tar.gz +RUN tar -vxf /usr/local/go.linux-amd64.tar.gz -C /usr/local/ +RUN ln -s /usr/local/go/bin/go /usr/local/bin/go + RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php81_xdebug \$@" >> /usr/local/bin/php81_container && chmod +x /usr/local/bin/php81_container RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php74_xdebug \$@" >> /usr/local/bin/php74_container && chmod +x /usr/local/bin/php74_container RUN echo "docker -H 192.168.36.240:4243 exec -w /var/www/html/\$(cat /root/.username)/\$(basename "\$PWD") php72_xdebug \$@" >> /usr/local/bin/php72_container && chmod +x /usr/local/bin/php72_container From 10ff9b15bd6b5efda7afbedb990f46d05c5ca101 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 18 Dec 2023 01:43:14 +0300 Subject: [PATCH 026/158] Update redis.conf --- etc/redis.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/redis.conf b/etc/redis.conf index eb03c58..5025672 100644 --- a/etc/redis.conf +++ b/etc/redis.conf @@ -66,7 +66,7 @@ # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES # JUST COMMENT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -bind 127.0.0.1 +#bind 127.0.0.1 # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. From a705ebdc3842c7c4524f8bfea3968ff67a3e62f3 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 18 Dec 2023 16:08:03 +0300 Subject: [PATCH 027/158] Rename default.conf to defaultconf --- etc/nginx/{default.conf => defaultconf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename etc/nginx/{default.conf => defaultconf} (100%) diff --git a/etc/nginx/default.conf b/etc/nginx/defaultconf similarity index 100% rename from etc/nginx/default.conf rename to etc/nginx/defaultconf From 524bf64c6ba8a637a8f2cfd98e3cb8d6c86cd4cc Mon Sep 17 00:00:00 2001 From: burakkaya06 <43520239+burakkaya06@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:47:17 +0300 Subject: [PATCH 028/158] ssh2 extension eklendi --- php72_xdebug/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index 0b161a3..6ca7df7 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -2,6 +2,7 @@ FROM php:7.2-fpm RUN apt-get update \ && apt-get install --no-install-recommends -y \ + libssh2-1-dev \ libfreetype6-dev \ libjpeg62-turbo-dev \ libmcrypt-dev \ @@ -57,6 +58,9 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di RUN pecl install xdebug-2.9.8 RUN docker-php-ext-enable xdebug +RUN pecl install ssh2-1.3.1 \ + && docker-php-ext-enable ssh2 + RUN docker-php-ext-install bcmath RUN echo "extension=yaml.so" > /usr/local/etc/php/conf.d/yaml.ini From 620946828982378e19cbbea616e13b35575817a5 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 27 Feb 2024 14:49:37 +0300 Subject: [PATCH 029/158] sonarqube changed --- docker-compose.yml.amd64.dist | 6 ++++++ docker-compose.yml.arm64.dist | 6 ++++++ docker-compose.yml.dist | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index f4feb54..155d407 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -659,6 +659,12 @@ services: sonarqube: image: sonarqube container_name: sonarqube + depends_on: + - postgres + environment: + SONAR_JDBC_URL: jdbc:postgresql://postgres:5432/sonarqubedb + SONAR_JDBC_USERNAME: postgres + SONAR_JDBC_PASSWORD: postgres ports: - ${SONARQUBE_PORT}:9000 restart: always diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 628c940..21bb0d4 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -660,6 +660,12 @@ services: sonarqube: image: sonarqube container_name: sonarqube + depends_on: + - postgres + environment: + SONAR_JDBC_URL: jdbc:postgresql://postgres:5432/sonarqubedb + SONAR_JDBC_USERNAME: postgres + SONAR_JDBC_PASSWORD: postgres ports: - ${SONARQUBE_PORT}:9000 restart: always diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index f4463a9..03ad372 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -645,6 +645,12 @@ services: sonarqube: image: sonarqube container_name: sonarqube + depends_on: + - postgres + environment: + SONAR_JDBC_URL: jdbc:postgresql://postgres:5432/sonarqubedb + SONAR_JDBC_USERNAME: postgres + SONAR_JDBC_PASSWORD: postgres ports: - ${SONARQUBE_PORT}:9000 restart: always From 25da66937f2e59a96050af64da4d53d7093b0bfd Mon Sep 17 00:00:00 2001 From: onuragtas Date: Thu, 18 Apr 2024 16:05:12 +0300 Subject: [PATCH 030/158] test --- httpd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 2f24a1e..dde48c4 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:22.04 LABEL maintainer="Sinan Turgut " RUN apt-get update && apt-get install -y --force-yes nano unzip wget curl From 37d698ba76b6791d9e45dcab340dec9a5b60849e Mon Sep 17 00:00:00 2001 From: onuragtas Date: Thu, 18 Apr 2024 16:09:53 +0300 Subject: [PATCH 031/158] test --- httpd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpd/Dockerfile b/httpd/Dockerfile index dde48c4..2f24a1e 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:latest LABEL maintainer="Sinan Turgut " RUN apt-get update && apt-get install -y --force-yes nano unzip wget curl From 90d72bcb06db5302283085894e1692bc37228f51 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Fri, 7 Jun 2024 12:52:42 +0100 Subject: [PATCH 032/158] config fixed --- etc/nginx/{defaultconf => default.conf} | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) rename etc/nginx/{defaultconf => default.conf} (76%) diff --git a/etc/nginx/defaultconf b/etc/nginx/default.conf similarity index 76% rename from etc/nginx/defaultconf rename to etc/nginx/default.conf index 1939af4..d305694 100644 --- a/etc/nginx/defaultconf +++ b/etc/nginx/default.conf @@ -20,14 +20,7 @@ server { location ~ \.php$ { include fastcgi_params; - if ($cookie_xdebug = "true") { - add_header X-Fastcgi-Xdebug true; - fastcgi_pass php72_xdebug:9000; - } - if ($cookie_xdebug != "true") { - add_header X-Fastcgi-Xdebug false; - fastcgi_pass php72_xdebug:9000; - } + fastcgi_pass php72:9000; fastcgi_index index.php; #fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; From d8240dd0d5bd0bfd52cc8d7f8883cf7a89a9c38c Mon Sep 17 00:00:00 2001 From: onuragtas Date: Fri, 7 Jun 2024 16:01:33 +0100 Subject: [PATCH 033/158] bugfix --- etc/nginx/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/nginx/default.conf b/etc/nginx/default.conf index d305694..6b466c6 100644 --- a/etc/nginx/default.conf +++ b/etc/nginx/default.conf @@ -20,7 +20,7 @@ server { location ~ \.php$ { include fastcgi_params; - fastcgi_pass php72:9000; + fastcgi_pass php72_xdebug:9000; fastcgi_index index.php; #fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; From fae35e6eb878290df267e0ae0031db7e47f6866a Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 10 Jun 2024 21:46:58 +0100 Subject: [PATCH 034/158] rabbitmq changed to dockerfile --- rabbitmq/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 rabbitmq/Dockerfile diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile new file mode 100644 index 0000000..72fa1a6 --- /dev/null +++ b/rabbitmq/Dockerfile @@ -0,0 +1,9 @@ +FROM rabbitmq:3.10.25-management + +RUN apt-get update && apt-get install -y curl unzip + +RUN curl -L https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/3.10.2/rabbitmq_delayed_message_exchange-3.10.2.ez > $RABBITMQ_HOME/plugins/rabbitmq_delayed_message_exchange-3.10.2.ez + +RUN chown rabbitmq:rabbitmq $RABBITMQ_HOME/plugins/rabbitmq_delayed_message_exchange-3.10.2.ez + +RUN rabbitmq-plugins enable rabbitmq_delayed_message_exchange \ No newline at end of file From c212ba515d27b47a68af130888378b1d8ce62fa8 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 10 Jun 2024 21:47:30 +0100 Subject: [PATCH 035/158] rabbitmq changed to build --- docker-compose.yml.amd64.dist | 2 +- docker-compose.yml.arm64.dist | 2 +- docker-compose.yml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 155d407..b81b011 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -62,7 +62,7 @@ services: net: rabbitmq: - image: rabbitmq:3.10.25-management + build: ./rabbitmq restart: always hostname: 'dev-rabbitmq' container_name: rabbitmq diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 21bb0d4..b2732cd 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -62,7 +62,7 @@ services: net: rabbitmq: - image: rabbitmq:3.10.25-management + build: ./rabbitmq restart: always hostname: 'dev-rabbitmq' container_name: rabbitmq diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 03ad372..56967eb 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -62,7 +62,7 @@ services: net: rabbitmq: - image: rabbitmq:3.10.25-management + build: ./rabbitmq restart: always hostname: 'dev-rabbitmq' container_name: rabbitmq From f04c46d6a684ce763ad2405c05d86b2f2885ed7f Mon Sep 17 00:00:00 2001 From: onuragtas Date: Fri, 14 Jun 2024 13:50:21 +0100 Subject: [PATCH 036/158] jvm option changed --- etc/elasticsearch/jvm.options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/elasticsearch/jvm.options b/etc/elasticsearch/jvm.options index 8a1f273..b9c8b94 100644 --- a/etc/elasticsearch/jvm.options +++ b/etc/elasticsearch/jvm.options @@ -19,8 +19,8 @@ # Xms represents the initial size of total heap space # Xmx represents the maximum size of total heap space --Xms1g --Xmx1g +-Xms4g +-Xmx4g ################################################################ ## Expert settings From 3043c5be3336b7088b2e1e1a64ec680a81c19bef Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 3 Jul 2024 12:50:04 +0100 Subject: [PATCH 037/158] timezone added --- php56/Dockerfile | 2 ++ php56_xdebug/Dockerfile | 2 ++ php70/Dockerfile | 2 ++ php71/Dockerfile | 2 ++ php71_xdebug/Dockerfile | 2 ++ php72/Dockerfile | 2 ++ php72_xdebug/Dockerfile | 2 ++ 7 files changed, 14 insertions(+) diff --git a/php56/Dockerfile b/php56/Dockerfile index 3ef0a7d..fad010b 100644 --- a/php56/Dockerfile +++ b/php56/Dockerfile @@ -31,6 +31,8 @@ RUN mkdir -p $COMPOSER_HOME \ RUN apt-get install -y --reinstall procps +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + ADD crontab /etc/cron.d/hello-cron RUN chmod 0644 /etc/cron.d/hello-cron RUN touch /var/log/cron.log diff --git a/php56_xdebug/Dockerfile b/php56_xdebug/Dockerfile index 561c705..b2c5333 100644 --- a/php56_xdebug/Dockerfile +++ b/php56_xdebug/Dockerfile @@ -39,6 +39,8 @@ RUN apt-get -y --force-yes install cron RUN apt-get install -y --reinstall procps +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + ARG XDEBUG_HOST ARG XDEBUG_PORT RUN echo "zend_extension=xdebug.so" >> /usr/local/etc/php/conf.d/xdebug.ini diff --git a/php70/Dockerfile b/php70/Dockerfile index 3674cd5..6c2f574 100644 --- a/php70/Dockerfile +++ b/php70/Dockerfile @@ -8,5 +8,7 @@ RUN docker-php-ext-install mbstring curl zip mysqli pdo pdo_pgsql pdo_mysql soap RUN pecl install redis-4.0.1 mongodb RUN apk del buildDeps +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && composer --version diff --git a/php71/Dockerfile b/php71/Dockerfile index 2003402..b6ce603 100644 --- a/php71/Dockerfile +++ b/php71/Dockerfile @@ -11,6 +11,8 @@ RUN apk del buildDeps RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && composer --version +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + ARG XDEBUG_HOST ARG XDEBUG_PORT diff --git a/php71_xdebug/Dockerfile b/php71_xdebug/Dockerfile index 66940ce..11287dd 100644 --- a/php71_xdebug/Dockerfile +++ b/php71_xdebug/Dockerfile @@ -81,6 +81,8 @@ RUN apt-get install -y --reinstall procps ARG XDEBUG_HOST ARG XDEBUG_PORT +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.remote_autostart=1" >> /usr/local/etc/php/conf.d/xdebug.ini &&\ echo "xdebug.remote_connect_back=${XDEBUG_REMOTE_CONNECT_BACK}" >> /usr/local/etc/php/conf.d/xdebug.ini &&\ diff --git a/php72/Dockerfile b/php72/Dockerfile index 12dca2f..f7c76ab 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -24,6 +24,8 @@ RUN apt-get update \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && composer --version +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && pecl install redis \ diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index 6ca7df7..dd51473 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -25,6 +25,8 @@ RUN apt-get update \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && composer --version +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && pecl install redis-5.3.6 \ From 57fef3b241b4b7c5c01491d55334b0c797453314 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 3 Jul 2024 18:25:01 +0100 Subject: [PATCH 038/158] version fix and timezone --- php56/Dockerfile | 4 ++++ php56_xdebug/Dockerfile | 4 ++++ php72/Dockerfile | 2 +- php81_xdebug/Dockerfile | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/php56/Dockerfile b/php56/Dockerfile index fad010b..fc2bec1 100644 --- a/php56/Dockerfile +++ b/php56/Dockerfile @@ -2,6 +2,10 @@ FROM php:5.6-fpm ENV COMPOSER_HOME=/root/.composer +RUN echo "deb [trusted=yes] http://archive.debian.org/debian stretch main non-free contrib" > /etc/apt/sources.list +RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian stretch main non-free contrib" >> /etc/apt/sources.list +RUN echo "deb [trusted=yes] http://archive.debian.org/debian-security stretch/updates main non-free contrib" >> /etc/apt/sources.list + RUN apt-get update \ && apt-get install -q -y --force-yes --no-install-recommends nano curl git wget zip unzip libpq-dev diff --git a/php56_xdebug/Dockerfile b/php56_xdebug/Dockerfile index b2c5333..925dab5 100644 --- a/php56_xdebug/Dockerfile +++ b/php56_xdebug/Dockerfile @@ -2,6 +2,10 @@ FROM php:5.6-fpm ENV COMPOSER_HOME=/root/.composer +RUN echo "deb [trusted=yes] http://archive.debian.org/debian stretch main non-free contrib" > /etc/apt/sources.list +RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian stretch main non-free contrib" >> /etc/apt/sources.list +RUN echo "deb [trusted=yes] http://archive.debian.org/debian-security stretch/updates main non-free contrib" >> /etc/apt/sources.list + RUN apt-get update \ && apt-get install -q -y --force-yes --no-install-recommends nano curl git wget zip unzip libpq-dev diff --git a/php72/Dockerfile b/php72/Dockerfile index f7c76ab..6c0505b 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -30,7 +30,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localt RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && pecl install redis \ && pecl install memcached-3.0.0 \ - && pecl install mongodb \ + && pecl install mongodb-1.9.1 \ && pecl install yaml \ && pecl install grpc \ && docker-php-ext-install \ diff --git a/php81_xdebug/Dockerfile b/php81_xdebug/Dockerfile index c4d0beb..d3f1334 100644 --- a/php81_xdebug/Dockerfile +++ b/php81_xdebug/Dockerfile @@ -81,6 +81,8 @@ RUN curl -sSL "https://codeload.github.com/phalcon/cphalcon/tar.gz/v${PHALCON_VE RUN apt-get install -y --reinstall procps +RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localtime + ARG XDEBUG_HOST ARG XDEBUG_PORT From 415aa74193b997b1ca521b38d96530f13d98f312 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 6 Jul 2024 22:45:13 +0100 Subject: [PATCH 039/158] devenv version changed --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index e5291e0..f037881 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:18.04 LABEL maintainer="hakanbysl@gmail.com" ENV DEBIAN_FRONTEND noninteractive From ceef2c0d542e12dbbaf9b99a8aa9afa1033bdcd0 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sat, 6 Jul 2024 23:07:47 +0100 Subject: [PATCH 040/158] version changed --- devenv/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index f037881..835c056 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="hakanbysl@gmail.com" ENV DEBIAN_FRONTEND noninteractive From 3b64cc1738ff94309f23cc0384b7dfb9449c70d0 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 30 Jul 2024 00:05:54 +0100 Subject: [PATCH 041/158] prometheus added --- .env.example | 5 ++++- .gitignore | 3 ++- docker-compose.yml.amd64.dist | 8 ++++++++ docker-compose.yml.arm64.dist | 8 ++++++++ docker-compose.yml.dist | 10 ++++++++++ etc/prometheus.yml.dist | 7 +++++++ 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 etc/prometheus.yml.dist diff --git a/.env.example b/.env.example index ef1eb9c..16af9f0 100644 --- a/.env.example +++ b/.env.example @@ -106,4 +106,7 @@ 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 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2820267..94adf50 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ elasticsearch_data/* arangodb_data_container/* arangodb_apps_data_container/* .idea/workspace.xml -.idea \ No newline at end of file +.idea +etc/prometheus.yml \ No newline at end of file diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index b81b011..60d2c3a 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -675,6 +675,14 @@ services: networks: net: + prometheus: + image: prom/prometheus + volumes: + - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" + networks: + - net + ports: + - ${PROMETHEUS_PORT}:9090 networks: net: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index b2732cd..d23f3db 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -676,6 +676,14 @@ services: networks: net: + prometheus: + image: prom/prometheus + volumes: + - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" + networks: + - net + ports: + - ${PROMETHEUS_PORT}:9090 networks: net: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 56967eb..dc49ff4 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -662,6 +662,16 @@ services: net: + prometheus: + image: prom/prometheus + volumes: + - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" + networks: + - net + ports: + - ${PROMETHEUS_PORT}:9090 + + networks: net: ipam: diff --git a/etc/prometheus.yml.dist b/etc/prometheus.yml.dist new file mode 100644 index 0000000..1cbde59 --- /dev/null +++ b/etc/prometheus.yml.dist @@ -0,0 +1,7 @@ +global: + scrape_interval: 10s +scrape_configs: + - job_name: 'spring-boot-application' + metrics_path: '/actuator/prometheus' + static_configs: + - targets: ['host.docker.internal:8090'] \ No newline at end of file From 2e0998bcd97fd6dc448a0c16ee439bbb0407be42 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 30 Jul 2024 00:14:10 +0100 Subject: [PATCH 042/158] container name added --- docker-compose.yml.amd64.dist | 1 + docker-compose.yml.arm64.dist | 1 + docker-compose.yml.dist | 1 + 3 files changed, 3 insertions(+) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 60d2c3a..6559ce9 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -676,6 +676,7 @@ services: net: prometheus: + container_name: prometheus image: prom/prometheus volumes: - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index d23f3db..45d786b 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -677,6 +677,7 @@ services: net: prometheus: + container_name: prometheus image: prom/prometheus volumes: - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index dc49ff4..e5cd0e9 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -663,6 +663,7 @@ services: prometheus: + container_name: prometheus image: prom/prometheus volumes: - "./etc/prometheus.yml:/etc/prometheus/prometheus.yml" From 4347225cc16505e46a345eb82732e98745045f33 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 30 Jul 2024 00:34:01 +0100 Subject: [PATCH 043/158] grafana added --- .gitignore | 3 ++- docker-compose.yml.amd64.dist | 14 ++++++++++++++ docker-compose.yml.arm64.dist | 14 ++++++++++++++ docker-compose.yml.dist | 13 +++++++++++++ grafana/datasource.yml.dist | 9 +++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 grafana/datasource.yml.dist diff --git a/.gitignore b/.gitignore index 94adf50..8b894ea 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ arangodb_data_container/* arangodb_apps_data_container/* .idea/workspace.xml .idea -etc/prometheus.yml \ No newline at end of file +etc/prometheus.yml +grafana/datasource.yml \ No newline at end of file diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 6559ce9..d84a9ec 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -685,6 +685,20 @@ services: ports: - ${PROMETHEUS_PORT}:9090 + grafana: + image: grafana/grafana + container_name: grafana + networks: + - net + ports: + - ${GRAFANA_PORT}:3000 + restart: unless-stopped + environment: + - GF_SECURITY_ADMIN_USER=admin + - GF_SECURITY_ADMIN_PASSWORD=grafana + volumes: + - ./grafana:/etc/grafana/provisioning/datasources + networks: net: ipam: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 45d786b..5f269da 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -686,6 +686,20 @@ services: ports: - ${PROMETHEUS_PORT}:9090 + grafana: + image: grafana/grafana + container_name: grafana + networks: + - net + ports: + - ${GRAFANA_PORT}:3000 + restart: unless-stopped + environment: + - GF_SECURITY_ADMIN_USER=admin + - GF_SECURITY_ADMIN_PASSWORD=grafana + volumes: + - ./grafana:/etc/grafana/provisioning/datasources + networks: net: ipam: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index e5cd0e9..423e8be 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -672,6 +672,19 @@ services: ports: - ${PROMETHEUS_PORT}:9090 + grafana: + image: grafana/grafana + container_name: grafana + networks: + - net + ports: + - ${GRAFANA_PORT}:3000 + restart: unless-stopped + environment: + - GF_SECURITY_ADMIN_USER=admin + - GF_SECURITY_ADMIN_PASSWORD=grafana + volumes: + - ./grafana:/etc/grafana/provisioning/datasources networks: net: diff --git a/grafana/datasource.yml.dist b/grafana/datasource.yml.dist new file mode 100644 index 0000000..c6d2139 --- /dev/null +++ b/grafana/datasource.yml.dist @@ -0,0 +1,9 @@ +apiVersion: 1 + +datasources: +- name: Prometheus + type: prometheus + url: http://prometheus:9090 + isDefault: true + access: proxy + editable: true \ No newline at end of file From 8b3ac868e089d7708fd876554b77a5f206e51520 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 17 Sep 2024 11:19:06 +0100 Subject: [PATCH 044/158] version added --- devenv/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index 835c056..c00b023 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:20.04 LABEL maintainer="hakanbysl@gmail.com" +ENV version 1.0.0 ENV DEBIAN_FRONTEND noninteractive From 04d1d39ac469a76ec6c433ba08fbab18d9b554c3 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 17 Sep 2024 11:52:29 +0100 Subject: [PATCH 045/158] unzip added --- devenv/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devenv/Dockerfile b/devenv/Dockerfile index c00b023..e07a227 100644 --- a/devenv/Dockerfile +++ b/devenv/Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y openssh-server \ nodejs \ npm \ git \ + unzip \ net-tools \ htop \ telnet \ From b341f91ea1249d6af539fa3dcc8a7469722ccc75 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Sun, 6 Oct 2024 23:30:54 +0100 Subject: [PATCH 046/158] unzip added --- php56/Dockerfile | 2 ++ php56_xdebug/Dockerfile | 2 ++ php70/Dockerfile | 2 +- php71/Dockerfile | 2 +- php71_xdebug/Dockerfile | 2 ++ php72/Dockerfile | 2 ++ php72_xdebug/Dockerfile | 2 ++ 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/php56/Dockerfile b/php56/Dockerfile index fc2bec1..97f8419 100644 --- a/php56/Dockerfile +++ b/php56/Dockerfile @@ -16,6 +16,8 @@ RUN apt-get install -y --force-yes libmemcached11 libmemcachedutil2 build-essent RUN apt-get install -y --force-yes \ libssl-dev libxslt1-dev \ libfreetype6-dev \ + libzip-dev \ + zip \ libjpeg62-turbo-dev \ libmcrypt-dev \ zlib1g-dev libicu-dev g++ \ diff --git a/php56_xdebug/Dockerfile b/php56_xdebug/Dockerfile index 925dab5..3d9101c 100644 --- a/php56_xdebug/Dockerfile +++ b/php56_xdebug/Dockerfile @@ -17,6 +17,8 @@ RUN apt-get install -y --force-yes \ libssl-dev libxslt1-dev \ libfreetype6-dev \ libjpeg62-turbo-dev \ + libzip-dev \ + zip \ libmcrypt-dev \ zlib1g-dev libicu-dev g++ \ && docker-php-ext-configure intl && docker-php-ext-install intl \ diff --git a/php70/Dockerfile b/php70/Dockerfile index 6c2f574..637ee25 100644 --- a/php70/Dockerfile +++ b/php70/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.0-fpm-alpine -RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev +RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev libzip-dev zip RUN docker-php-ext-install mbstring curl zip mysqli pdo pdo_pgsql pdo_mysql soap bcmath diff --git a/php71/Dockerfile b/php71/Dockerfile index b6ce603..155726d 100644 --- a/php71/Dockerfile +++ b/php71/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.1-fpm-alpine -RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev +RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev libzip-dev zip RUN docker-php-ext-install mbstring curl zip mysqli pdo pdo_pgsql pdo_mysql soap bcmath diff --git a/php71_xdebug/Dockerfile b/php71_xdebug/Dockerfile index 11287dd..fa369e3 100644 --- a/php71_xdebug/Dockerfile +++ b/php71_xdebug/Dockerfile @@ -16,6 +16,8 @@ RUN apt-get update \ libmemcached-dev \ freetds-dev \ libyaml-dev \ + libzip-dev \ + zip \ libssl-dev \ openssl \ libcurl4-gnutls-dev \ diff --git a/php72/Dockerfile b/php72/Dockerfile index 6c0505b..8d68615 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -9,6 +9,8 @@ RUN apt-get update \ libpng-dev \ zlib1g-dev \ libicu-dev \ + libzip-dev \ + zip \ g++ \ unixodbc-dev \ libxml2-dev \ diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index dd51473..0e76464 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -12,6 +12,8 @@ RUN apt-get update \ libicu-dev \ g++ \ unixodbc-dev \ + libzip-dev \ + zip \ libxml2-dev \ libaio-dev \ libmemcached-dev \ From 4e7195e7b5a6f3ff660b05ae22a9d2edfcecbbda Mon Sep 17 00:00:00 2001 From: onuragtas Date: Fri, 11 Oct 2024 18:05:58 +0100 Subject: [PATCH 047/158] unzip added --- php72/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php72/Dockerfile b/php72/Dockerfile index 8d68615..58ea7ef 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -30,7 +30,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localt RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ - && pecl install redis \ + && pecl install redis-5.3.6 \ && pecl install memcached-3.0.0 \ && pecl install mongodb-1.9.1 \ && pecl install yaml \ From c20dbef9885561f0beb14d4050b6df3b640a8b88 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 14:54:37 +0000 Subject: [PATCH 048/158] mongodb version changed --- docker-compose.yml.amd64.dist | 2 +- docker-compose.yml.arm64.dist | 2 +- docker-compose.yml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index d84a9ec..863c9f4 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:4.2 + image: mongo:3.2 container_name: mongodb restart: always environment: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 5f269da..d055421 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:4.2 + image: mongo:3.2 container_name: mongodb restart: always environment: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 423e8be..d848f5c 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:4.2 + image: mongo:3.2 container_name: mongodb restart: always environment: From 1a8b0de0aac6325eab5d3bd2fe3a961bc799c166 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 15:00:25 +0000 Subject: [PATCH 049/158] mongodb version changed --- docker-compose.yml.amd64.dist | 2 +- docker-compose.yml.arm64.dist | 2 +- docker-compose.yml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 863c9f4..d84a9ec 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:3.2 + image: mongo:4.2 container_name: mongodb restart: always environment: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index d055421..5f269da 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:3.2 + image: mongo:4.2 container_name: mongodb restart: always environment: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index d848f5c..423e8be 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -188,7 +188,7 @@ services: ipv4_address: 172.28.1.9 mongodb: - image: mongo:3.2 + image: mongo:4.2 container_name: mongodb restart: always environment: From 66aebf456ccd63d7bb1878a78f76bb23ea3ffd86 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 15:45:46 +0000 Subject: [PATCH 050/158] mongodb 3.2,4.2 and 6.0 added --- .env.example | 8 +++++- docker-compose.yml.amd64.dist | 51 ++++++++++++++++++++++++++++++++++ docker-compose.yml.arm64.dist | 51 ++++++++++++++++++++++++++++++++++ docker-compose.yml.dist | 52 +++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 16af9f0..f7b293a 100644 --- a/.env.example +++ b/.env.example @@ -29,9 +29,15 @@ 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 #POSTGRES POSTGRES_HOST=172.28.1.7 diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index d84a9ec..8775c96 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -204,6 +204,57 @@ services: net: ipv4_address: ${MONGODB_HOST} + mongodb42: + image: mongo:4.2 + container_name: mongodb42 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo42/db:/data/db' + ports: + - ${MONGODB42_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB42_HOST} + + mongodb32: + image: mongo:3.2 + container_name: mongodb32 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo32/db:/data/db' + ports: + - ${MONGODB32_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB32_HOST} + + mongodb60: + image: mongo:6.0 + container_name: mongodb60 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo60/db:/data/db' + ports: + - ${MONGODB60_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB60_HOST} + graylog: image: graylog/graylog:3.3.4-1 restart: always diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 5f269da..9740242 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -204,6 +204,57 @@ services: net: ipv4_address: ${MONGODB_HOST} + mongodb42: + image: mongo:4.2 + container_name: mongodb42 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo42/db:/data/db' + ports: + - ${MONGODB42_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB42_HOST} + + mongodb32: + image: mongo:3.2 + container_name: mongodb32 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo32/db:/data/db' + ports: + - ${MONGODB32_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB32_HOST} + + mongodb60: + image: mongo:6.0 + container_name: mongodb60 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo60/db:/data/db' + ports: + - ${MONGODB60_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB60_HOST} + graylog: image: graylog/graylog:3.3.4-1 restart: always diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 423e8be..493def6 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -204,6 +204,58 @@ services: net: ipv4_address: ${MONGODB_HOST} + mongodb42: + image: mongo:4.2 + container_name: mongodb42 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo42/db:/data/db' + ports: + - ${MONGODB42_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB42_HOST} + + mongodb32: + image: mongo:3.2 + container_name: mongodb32 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo32/db:/data/db' + ports: + - ${MONGODB32_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB32_HOST} + + mongodb60: + image: mongo:6.0 + container_name: mongodb60 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo60/db:/data/db' + ports: + - ${MONGODB60_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB60_HOST} + + graylog: image: graylog/graylog:3.3.4-1 restart: always From 4f7de1baa17f1481b10ce6cd1cfd23aae9c6f367 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 15:46:27 +0000 Subject: [PATCH 051/158] platform added --- docker-compose.yml.arm64.dist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 9740242..055e802 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -207,6 +207,7 @@ services: mongodb42: image: mongo:4.2 container_name: mongodb42 + platform: linux/amd64 restart: always environment: - MONGO_DATA_DIR=/data/db @@ -224,6 +225,7 @@ services: mongodb32: image: mongo:3.2 container_name: mongodb32 + platform: linux/amd64 restart: always environment: - MONGO_DATA_DIR=/data/db @@ -241,6 +243,7 @@ services: mongodb60: image: mongo:6.0 container_name: mongodb60 + platform: linux/amd64 restart: always environment: - MONGO_DATA_DIR=/data/db From 39b68fccbf9e8d2f72f1731390dddfbc393494aa Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 15:52:32 +0000 Subject: [PATCH 052/158] platform added --- .env.example | 2 ++ docker-compose.yml.amd64.dist | 17 +++++++++++++++++ docker-compose.yml.arm64.dist | 18 ++++++++++++++++++ docker-compose.yml.dist | 17 +++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/.env.example b/.env.example index f7b293a..c54af04 100644 --- a/.env.example +++ b/.env.example @@ -38,6 +38,8 @@ 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 diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index 8775c96..b7556b5 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -255,6 +255,23 @@ services: net: ipv4_address: ${MONGODB60_HOST} + mongodb80: + image: mongo:8.0 + container_name: mongodb80 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo80/db:/data/db' + ports: + - ${MONGODB80_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB80_HOST} + graylog: image: graylog/graylog:3.3.4-1 restart: always diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 055e802..8479e02 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -258,6 +258,24 @@ services: net: ipv4_address: ${MONGODB60_HOST} + mongodb80: + image: mongo:8.0 + container_name: mongodb80 + restart: always + platform: linux/amd64 + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo80/db:/data/db' + ports: + - ${MONGODB80_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB80_HOST} + graylog: image: graylog/graylog:3.3.4-1 restart: always diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 493def6..2fad647 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -256,6 +256,23 @@ services: ipv4_address: ${MONGODB60_HOST} + mongodb80: + image: mongo:8.0 + container_name: mongodb80 + restart: always + environment: + - MONGO_DATA_DIR=/data/db + - MONGO_LOG_DIR=/dev/null + - MONGODB_USER=${MONGODB_USER} + - MONGODB_PASS=${MONGODB_PASS} + volumes: + - './mongo80/db:/data/db' + ports: + - ${MONGODB80_PORT}:27017 + networks: + net: + ipv4_address: ${MONGODB80_HOST} + graylog: image: graylog/graylog:3.3.4-1 restart: always From fcdd260cb3c6d5f082eb809387758938ae7899f0 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 21:06:58 +0000 Subject: [PATCH 053/158] mongodb downgraded --- php72/Dockerfile | 2 +- php72_xdebug/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php72/Dockerfile b/php72/Dockerfile index 58ea7ef..6862bbe 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -32,7 +32,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localt RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && pecl install redis-5.3.6 \ && pecl install memcached-3.0.0 \ - && pecl install mongodb-1.9.1 \ + && pecl install mongodb-1.5.3 \ && pecl install yaml \ && pecl install grpc \ && docker-php-ext-install \ diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index 0e76464..990a897 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -33,7 +33,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Asia/Istanbul /etc/localt RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && pecl install redis-5.3.6 \ && pecl install memcached-3.0.0 \ - && pecl install mongodb-1.9.1 \ + && pecl install mongodb-1.5.3 \ && pecl install yaml \ && pecl install grpc \ && docker-php-ext-install \ From 84ff98f65993d45dfd016d808f48ee94a459f6f8 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 22:52:40 +0000 Subject: [PATCH 054/158] gitignore changed --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b894ea..cbc84d4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ arangodb_apps_data_container/* .idea/workspace.xml .idea etc/prometheus.yml -grafana/datasource.yml \ No newline at end of file +grafana/datasource.yml +devenv.json \ No newline at end of file From 8addb8dbc71a8ea8df6e6cf331f81ff918b85627 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Mon, 28 Oct 2024 23:35:07 +0000 Subject: [PATCH 055/158] fix metadata added --- .gitignore | 3 ++- fix_metadata.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 fix_metadata.py diff --git a/.gitignore b/.gitignore index cbc84d4..5dc9bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ arangodb_apps_data_container/* .idea etc/prometheus.yml grafana/datasource.yml -devenv.json \ No newline at end of file +devenv.json +fix_metadata.py \ No newline at end of file diff --git a/fix_metadata.py b/fix_metadata.py new file mode 100644 index 0000000..a01c065 --- /dev/null +++ b/fix_metadata.py @@ -0,0 +1,48 @@ +import json +import os +import sys + +def convert_mongo_types(data): + # Eğer veri bir sözlükse + if isinstance(data, dict): + new_data = {} + for key, value in data.items(): + # `$numberInt` varsa, düz tam sayıya çevir + if key == "$numberInt" and isinstance(value, str): + try: + return int(value) + except ValueError: + return value + # `$numberDouble` varsa, düz ondalıklı sayıya çevir + elif key == "$numberDouble" and isinstance(value, str): + try: + return float(value) + except ValueError: + return value + else: + new_data[key] = convert_mongo_types(value) + return new_data + # Eğer veri bir listeyse, her öğeyi dönüştür + elif isinstance(data, list): + return [convert_mongo_types(item) for item in data] + else: + return data + +# metadata.json dosyalarını bulmak için dizin +backup_path = sys.argv[1] + +for root, dirs, files in os.walk(backup_path): + for file in files: + if 'metadata.json' in file: + file_path = os.path.join(root, file) + with open(file_path, 'r') as f: + data = json.load(f) + + # JSON verisini dönüştür + updated_data = convert_mongo_types(data) + + # Dosyayı güncellenmiş JSON ile tekrar yaz + with open(file_path, 'w') as f: + json.dump(updated_data, f, indent=4) + +print("Dönüştürme işlemi tamamlandı!") \ No newline at end of file From 3171cd49a7e2f17166d6ebabb6ae68bba98f2e72 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Tue, 29 Oct 2024 13:23:43 +0300 Subject: [PATCH 056/158] Update .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 5dc9bcb..5c3c9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ postgres/* logs/* Ssl/* mongo/* +mongo32/* +mongo42/* +mongo60/* +mongo80/* pgadmin/* logs/access.log logs/error.log From 174762844fd7e7fac0d3c711cbb3db0c38dc2bb8 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Thu, 31 Oct 2024 14:51:39 +0000 Subject: [PATCH 057/158] update --- devenv/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devenv/README.md b/devenv/README.md index b13f11c..853f9b2 100644 --- a/devenv/README.md +++ b/devenv/README.md @@ -18,4 +18,5 @@ docker run -d \ -e "PASSWORD=password" \ -v /sites/hakanbaysal:/sites \ hakanbaysal/devenv:latest -``` \ No newline at end of file +``` + From 96cae4c912929c13a0fbdbe6c39b0d2effc6df0f Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 6 Nov 2024 15:55:23 +0300 Subject: [PATCH 058/158] unzip added --- .idea/workspace.xml | 74 +++++++++++++++++++++++++++++------------ php56/Dockerfile | 1 + php56_xdebug/Dockerfile | 1 + php70/Dockerfile | 2 +- php72/Dockerfile | 1 + php72_xdebug/Dockerfile | 1 + 6 files changed, 58 insertions(+), 22 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5a638f2..ecc8cff 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,6 +6,11 @@ + + + + + + + @@ -54,34 +71,40 @@ + - { - "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" + +}]]> @@ -125,6 +148,14 @@ + + + + + + @@ -193,6 +224,7 @@ + 1598516362677 diff --git a/php56/Dockerfile b/php56/Dockerfile index 97f8419..b4b10bc 100644 --- a/php56/Dockerfile +++ b/php56/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get install -y --force-yes \ libfreetype6-dev \ libzip-dev \ zip \ + unzip \ libjpeg62-turbo-dev \ libmcrypt-dev \ zlib1g-dev libicu-dev g++ \ diff --git a/php56_xdebug/Dockerfile b/php56_xdebug/Dockerfile index 3d9101c..e3b855f 100644 --- a/php56_xdebug/Dockerfile +++ b/php56_xdebug/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get install -y --force-yes \ libjpeg62-turbo-dev \ libzip-dev \ zip \ + unzip \ libmcrypt-dev \ zlib1g-dev libicu-dev g++ \ && docker-php-ext-configure intl && docker-php-ext-install intl \ diff --git a/php70/Dockerfile b/php70/Dockerfile index 637ee25..63ae520 100644 --- a/php70/Dockerfile +++ b/php70/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.0-fpm-alpine -RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev libzip-dev zip +RUN apk add --no-cache --update --virtual buildDeps bash libcurl curl curl-dev autoconf gcc make g++ zlib-dev libzip-dev postgresql-dev libxml2-dev libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev gd icu-dev libxslt libxslt-dev libmemcached libmemcached-dev libzip-dev zip unzip RUN docker-php-ext-install mbstring curl zip mysqli pdo pdo_pgsql pdo_mysql soap bcmath diff --git a/php72/Dockerfile b/php72/Dockerfile index 6862bbe..e4fc569 100644 --- a/php72/Dockerfile +++ b/php72/Dockerfile @@ -47,6 +47,7 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di soap \ sockets \ zip \ + unzip \ pcntl \ ftp \ pgsql \ diff --git a/php72_xdebug/Dockerfile b/php72_xdebug/Dockerfile index 990a897..1a94f39 100644 --- a/php72_xdebug/Dockerfile +++ b/php72_xdebug/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update \ unixodbc-dev \ libzip-dev \ zip \ + unzip \ libxml2-dev \ libaio-dev \ libmemcached-dev \ From 8c832b6f19c42b2d5d30c101b769f867b3de66a0 Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 6 Nov 2024 18:52:38 +0300 Subject: [PATCH 059/158] keycloak added --- .env.example | 5 ++++- .gitignore | 3 ++- docker-compose.yml.amd64.dist | 16 ++++++++++++++++ docker-compose.yml.arm64.dist | 17 +++++++++++++++++ docker-compose.yml.dist | 17 +++++++++++++++++ 5 files changed, 56 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index c54af04..e4e2dd9 100644 --- a/.env.example +++ b/.env.example @@ -117,4 +117,7 @@ KAFDROP_PORT=9001 SONARQUBE_PORT=9095 #PROMETHEUS -PROMETHEUS_PORT=9090 \ No newline at end of file +PROMETHEUS_PORT=9090 + +#KEYCLOAK +KEYCLOAK_PORT=8091 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5c3c9ea..6282edd 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ arangodb_apps_data_container/* etc/prometheus.yml grafana/datasource.yml devenv.json -fix_metadata.py \ No newline at end of file +fix_metadata.py +keycloak/* \ No newline at end of file diff --git a/docker-compose.yml.amd64.dist b/docker-compose.yml.amd64.dist index b7556b5..0da5d97 100755 --- a/docker-compose.yml.amd64.dist +++ b/docker-compose.yml.amd64.dist @@ -767,6 +767,22 @@ services: volumes: - ./grafana:/etc/grafana/provisioning/datasources + keycloak: + image: quay.io/keycloak/keycloak:26.0.5 + container_name: keycloak + networks: + - net + ports: + - ${KEYCLOAK_PORT}:8080 + restart: unless-stopped + command: start-dev + environment: + - KC_BOOTSTRAP_ADMIN_USERNAME=admin + - KC_BOOTSTRAP_ADMIN_PASSWORD=admin + volumes: + - ./keycloak/data:/opt/keycloak/data + - ./keycloak/providers:/opt/keycloak/providers + networks: net: ipam: diff --git a/docker-compose.yml.arm64.dist b/docker-compose.yml.arm64.dist index 8479e02..d9be5af 100755 --- a/docker-compose.yml.arm64.dist +++ b/docker-compose.yml.arm64.dist @@ -772,6 +772,23 @@ services: volumes: - ./grafana:/etc/grafana/provisioning/datasources + keycloak: + image: quay.io/keycloak/keycloak:26.0.5 + container_name: keycloak + networks: + - net + ports: + - ${KEYCLOAK_PORT}:8080 + restart: unless-stopped + command: start-dev + environment: + - KC_BOOTSTRAP_ADMIN_USERNAME=admin + - KC_BOOTSTRAP_ADMIN_PASSWORD=admin + volumes: + - ./keycloak/data:/opt/keycloak/data + - ./keycloak/providers:/opt/keycloak/providers + + networks: net: ipam: diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index 2fad647..16b0e46 100755 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -755,6 +755,23 @@ services: volumes: - ./grafana:/etc/grafana/provisioning/datasources + keycloak: + image: quay.io/keycloak/keycloak:26.0.5 + container_name: keycloak + networks: + - net + ports: + - ${KEYCLOAK_PORT}:8080 + restart: unless-stopped + command: start-dev + environment: + - KC_BOOTSTRAP_ADMIN_USERNAME=admin + - KC_BOOTSTRAP_ADMIN_PASSWORD=admin + volumes: + - ./keycloak/data:/opt/keycloak/data + - ./keycloak/providers:/opt/keycloak/providers + + networks: net: ipam: From 4cb603eeb2ed13652f4fad9a49b8989516d2cf5e Mon Sep 17 00:00:00 2001 From: onuragtas Date: Wed, 6 Nov 2024 18:53:38 +0300 Subject: [PATCH 060/158] deleted --- .idea/docker.iml | 11 -- .idea/misc.xml | 9 - .idea/modules.xml | 8 - .idea/workspace.xml | 434 -------------------------------------------- 4 files changed, 462 deletions(-) delete mode 100644 .idea/docker.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/workspace.xml 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 ecc8cff..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -