Bladeren bron

:wrench: add third dependencies

Jeremy Zheng 1 jaar geleden
bovenliggende
commit
abf99889aa
2 gewijzigde bestanden met toevoegingen van 42 en 37 verwijderingen
  1. 42 37
      docker/spring/Dockerfile
  2. 0 0
      docker/spring/etc/nginx/sites-enabled/default.conf

+ 42 - 37
docker/spring/Dockerfile

@@ -5,13 +5,13 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt update
 RUN apt -y upgrade
-RUN apt -y install locales locales-all curl wget vim tzdata pwgen zip unzip tree tmux dialog asciidoc doxygen \
-    build-essential mold \
-    php-cli php-fpm php-xml php-imap php-intl php-mbstring php-bcmath php-bz2 php-zip php-curl php-gd php-imagick php-pgsql php-mysql php-sqlite3 php-redis php-amqp \
-    postgresql postgresql-contrib rabbitmq-server redis \
+RUN apt -y install zsh locales locales-all curl wget vim tzdata pwgen zip unzip tree tmux dialog asciidoc doxygen \
+    build-essential mold cmake supervisor \
+    composer php-xdebug php-cli php-fpm php-xml php-imap php-intl php-mbstring php-bcmath php-bz2 php-zip php-curl php-gd php-imagick php-pgsql php-mysql php-sqlite3 php-redis php-amqp \
+    nginx postgresql postgresql-contrib rabbitmq-server redis \
     fonts-dejavu-extra fonts-opensymbol fonts-lxgw-wenkai fonts-smiley-sans \
     fonts-noto-extra fonts-noto-cjk-extra fonts-noto-color-emoji \
-    fonts-arphic-ukai fonts-arphic-uming  \
+    fonts-arphic-ukai fonts-arphic-uming \
     fonts-wqy-microhei fonts-wqy-zenhei \
     fonts-cns11643-kai fonts-cns11643-sung \
     fonts-moe-standard-kai fonts-moe-standard-song \
@@ -31,10 +31,10 @@ RUN mkdir -p $HOME/downloads $HOME/build $HOME/local $HOME/tmp
 
 # https://github.com/ohmyzsh/ohmyzsh
 RUN git clone https://github.com/ohmyzsh/ohmyzsh.git $HOME/.oh-my-zsh
-RUN cp $HOME/.oh-my-zsh/templates/zshrc.zsh-template $HOME/.zshrc
-RUN echo 'export LANG=en_US.UTF-8' >> $HOME/.zshrc
-RUN echo 'export LC_ALL=en_US.UTF-8' >> $HOME/.zshrc
-RUN echo 'export PATH=$HOME/.local/bin:$PATH' >> $HOME/.zshrc
+RUN cp $HOME/.oh-my-zsh/templates/zshrc.zsh-template $HOME/.zshrc \
+    && echo 'export LANG=en_US.UTF-8' >> $HOME/.zshrc \
+    && echo 'export LC_ALL=en_US.UTF-8' >> $HOME/.zshrc \
+    && echo 'export PATH=$HOME/.local/bin:$PATH' >> $HOME/.zshrc
 
 RUN git config --global core.quotepath false \
     && git config --global http.version HTTP/1.1 \
@@ -46,34 +46,31 @@ RUN echo 'set-option -g history-limit 102400' > $HOME/.tmux.conf \
 # https://github.com/nvm-sh/nvm
 ENV NVM_VERSION "v0.40.1"
 RUN git clone -b ${NVM_VERSION} https://github.com/nvm-sh/nvm.git $HOME/.nvm
-RUN echo 'export NVM_DIR="$HOME/.nvm"' >> $HOME/.zshrc
-RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $HOME/.zshrc
-RUN echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"' >> $HOME/.zshrc
-RUN zsh -c "source $HOME/.zshrc \
-    && nvm install --lts"
-
-RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
-RUN locale-gen
-RUN update-locale LANG=en_US.UTF-8
+RUN echo 'export NVM_DIR="$HOME/.nvm"' >> $HOME/.zshrc \
+    && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $HOME/.zshrc \
+    && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"' >> $HOME/.zshrc
+RUN zsh -c "source $HOME/.zshrc && nvm install --lts"
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+    && locale-gen \
+    && update-locale LANG=en_US.UTF-8 
 RUN update-alternatives --set editor /usr/bin/vim.basic
-RUN mkdir -p $HOME/downloads
+RUN mkdir -p $HOME/downloads $HOME/tmp
 
 # https://opensearch.org/downloads.html#opensearch
-ENV OPENSEARCH_VERSION "2.17.0"
+ENV OPENSEARCH_VERSION "2.17.1"
 ENV OPENSEARCH_JAVA_HOME "/opt/opensearch-${OPENSEARCH_VERSION}/jdk"
 RUN wget -q -P $HOME/downloads \
-    https://artifacts.opensearch.org/releases/bundle/opensearch/${OPENSEARCH_VERSION}/opensearch-${OPENSEARCH_VERSION}-linux-${OPENSEARCH_ARCH}.tar.gz
-RUN cd /opt && tar xf $HOME/downloads/opensearch-${OPENSEARCH_VERSION}-linux-${OPENSEARCH_ARCH}.tar.gz \
+    https://artifacts.opensearch.org/releases/bundle/opensearch/${OPENSEARCH_VERSION}/opensearch-${OPENSEARCH_VERSION}-linux-x64.tar.gz
+RUN cd /opt && tar xf $HOME/downloads/opensearch-${OPENSEARCH_VERSION}-linux-x64.tar.gz \
     && mv /opt/opensearch-${OPENSEARCH_VERSION} /opt/opensearch \
-    && echo "network.host: 0.0.0.0" >> /opt/opensearch-${OPENSEARCH_VERSION}/config/opensearch.yml \
-    && echo "discovery.type: single-node" >> /opt/opensearch-${OPENSEARCH_VERSION}/config/opensearch.yml \
-    && echo "plugins.security.disabled: true" >> /opt/opensearch-${OPENSEARCH_VERSION}/config/opensearch.yml
-
-RUN wget -q -O $HOME/downloads/minio https://dl.min.io/server/minio/release/linux-amd64/minio \
-    && sudo mv $HOME/downloads/minio /usr/local/bin/minio \
-    && sudo chown root:root /usr/local/bin/minio \
-    && sudo chmod +x /usr/local/bin/minio
-RUN mkdir -p /var/lib/minio/data \
+    && echo "network.host: 0.0.0.0" >> /opt/opensearch/config/opensearch.yml \
+    && echo "discovery.type: single-node" >> /opt/opensearch/config/opensearch.yml \
+    && echo "plugins.security.disabled: true" >> /opt/opensearch/config/opensearch.yml
+
+RUN wget -q -O /usr/local/bin/minio https://dl.min.io/server/minio/release/linux-amd64/minio
+RUN chmod 555 /usr/local/bin/minio \
+    && mkdir -p /var/lib/minio/data \
     && chown -R nobody /var/lib/minio
 
 # https://www.rabbitmq.com/access-control.html#loopback-users
@@ -82,11 +79,10 @@ RUN echo 'loopback_users = none' >> /etc/rabbitmq/rabbitmq.conf \
     && rabbitmq-plugins enable rabbitmq_mqtt \
     && rabbitmq-plugins enable rabbitmq_management
 
-RUN su - postgres -c "/usr/bin/initdb -D /var/lib/postgres/data"
+RUN mkdir /var/lib/postgres && chown -R postgres:postgres /var/lib/postgres
+RUN su - postgres -c "/usr/lib/postgresql/16/bin/initdb -D /var/lib/postgres/data"
 RUN echo "listen_addresses = '0.0.0.0'" >> /var/lib/postgres/data/postgresql.conf \
-    && echo "host  all  all 0.0.0.0/0 md5" >> /var/lib/postgres/data/pg_hba.conf \
-    && mkdir /run/postgresql \
-    && chown -R postgres:postgres /run/postgresql
+    && echo "host  all  all 0.0.0.0/0 md5" >> /var/lib/postgres/data/pg_hba.conf 
 
 ADD etc/redis/* /etc/redis/
 RUN mkdir -p /var/lib/redis \
@@ -100,11 +96,20 @@ RUN mkdir -p /var/www/html \
     && echo "daemon off;" >> /etc/nginx/nginx.conf \
     && sed -i '35,79d' /etc/nginx/nginx.conf \
     && sed -i '35i include sites-enabled/*.conf;' /etc/nginx/nginx.conf \
-    && sed -i "s/error_log =.*/error_log = log\/php-fpm.log/g" /etc/php/php-fpm.conf
-ADD etc/nginx/sites-enabled/localhost.conf /etc/nginx/sites-enabled/localhost.conf
+    && sed -i "s/error_log =.*/error_log = log\/php-fpm.log/g" /etc/php/8.3/fpm/php-fpm.conf
+ADD etc/nginx/sites-enabled/default.conf /etc/nginx/sites-enabled/default.conf
 
 ADD etc/supervisor /etc/supervisor
 
+# git rev-parse --short HEAD
+ENV MING_VERSION "9eac3aa97"
+RUN git clone --depth=1 --branch development https://github.com/iapt-platform/mint.git $HOME/workspace/mint
+RUN zsh -c "source $HOME/.zshrc \
+    && cd $HOME/workspace/mint && git checkout ${MING_VERSION} \
+    && cd $HOME/workspace/mint/api-v8 && composer install && npm install \
+    && cd $HOME/workspace/mint/api-v8/public && composer install && npm install \
+    && cd $HOME/workspace/mint/dashboard-v4/dashboard && npm install"
+
 RUN echo "$(date -u +%4Y%m%d%H%M%S)" | tee /VERSION
 
 VOLUME /workspace

+ 0 - 0
docker/spring/etc/nginx/sites-enabled/localhost.conf → docker/spring/etc/nginx/sites-enabled/default.conf