Update Dockerfile

Dockerfile

@@ -20,61 +20,32 @@ RUN apt-get update && apt-get install -y \
     pkg-config \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) gd pdo pdo_mysql zip exif fileinfo bcmath \
+    && pecl install imagick \
+    && docker-php-ext-enable imagick \
+    && a2enmod rewrite mime \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pecl install imagick && \
-    docker-php-ext-enable imagick
-
-RUN a2enmod rewrite mime
-
-# 安装 Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
 WORKDIR /var/www/html
 
-RUN curl -L https://github.com/lsky-org/lsky-pro/archive/refs/heads/master.zip -o lsky-pro.zip \
+RUN curl -L https://github.com/zjmkkk/lsky-pro/releases/download/lsky-pro/lsky-pro.zip -o lsky-pro.zip \
     && unzip lsky-pro.zip \
-    && mv lsky-pro-master/* /var/www/html/ \
-    && mv lsky-pro-master/.* /var/www/html/ 2>/dev/null || true \
-    && rm -rf lsky-pro.zip lsky-pro-master
-
-# 创建所有必要的目录并设置777权限
-RUN mkdir -p /var/www/html/storage/app/public/images \
-    && mkdir -p /var/www/html/storage/app/public/avatars \
-    && mkdir -p /var/www/html/storage/framework/cache \
-    && mkdir -p /var/www/html/storage/framework/sessions \
-    && mkdir -p /var/www/html/storage/framework/testing \
-    && mkdir -p /var/www/html/storage/framework/views \
-    && mkdir -p /var/www/html/storage/logs \
-    && mkdir -p /var/www/html/bootstrap/cache \
+    && rm lsky-pro.zip \
+    && touch /var/www/html/.env \
     && mkdir -p /var/www/html/database \
     && touch /var/www/html/database/database.sqlite \
+    && mkdir -p /var/www/html/storage/app/public/images \
+    && mkdir -p /var/www/html/public/storage \
+    && chmod 777 /var/www/html/.env \
+    && chmod -R 777 /var/www/html/database \
     && chmod -R 777 /var/www/html/storage \
     && chmod -R 777 /var/www/html/bootstrap/cache \
-    && chmod -R 777 /var/www/html/database \
-    && chmod 777 /var/www/html/database/database.sqlite \
-    && chmod -R 777 /var/www/html/public
-
-# 安装 PHP 依赖项
-RUN composer install --no-dev --optimize-autoloader
+    && chmod -R 777 /var/www/html/public \
+    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
+    && chown -R www-data:www-data /var/www/html
 
-# 复制环境配置文件并配置为使用 SQLite
-RUN cp .env.example .env \
-    && sed -i 's/DB_CONNECTION=mysql/DB_CONNECTION=sqlite/g' .env \
-    && sed -i 's/DB_DATABASE=lsky/DB_DATABASE=\/var\/www\/html\/database\/database.sqlite/g' .env \
-    && chmod 666 .env
-
-# 生成应用密钥
-RUN php artisan key:generate
-
-# 确保整个应用目录的权限正确
-RUN chown -R www-data:www-data /var/www/html \
-    && chmod -R 777 /var/www/html
-
-RUN echo 'ServerName 127.0.0.1' >> /etc/apache2/apache2.conf
-
-RUN echo '<VirtualHost *:7860>\n\
+RUN echo 'ServerName 127.0.0.1' >> /etc/apache2/apache2.conf \
+    && echo '<VirtualHost *:7860>\n\
     DocumentRoot /var/www/html/public\n\
     ErrorLog ${APACHE_LOG_DIR}/error.log\n\
     CustomLog ${APACHE_LOG_DIR}/access.log combined\n\
@@ -88,15 +59,13 @@ RUN echo '<VirtualHost *:7860>\n\
         AllowOverride All\n\
         Require all granted\n\
     </Directory>\n\
-</VirtualHost>' > /etc/apache2/sites-available/000-default.conf
-
-RUN echo '<IfModule mod_mime.c>\n\
+</VirtualHost>' > /etc/apache2/sites-available/000-default.conf \
+    && echo '<IfModule mod_mime.c>\n\
     AddType image/jpeg .jpg .jpeg\n\
     AddType image/png .png\n\
     AddType image/gif .gif\n\
-</IfModule>' >> /etc/apache2/apache2.conf
-
-RUN sed -i 's/80/7860/g' /etc/apache2/ports.conf
+</IfModule>' >> /etc/apache2/apache2.conf \
+    && sed -i 's/80/7860/g' /etc/apache2/ports.conf
 
 RUN { \
     echo 'open_basedir = /var/www/html:/tmp:/usr/local/lib/php'; \
@@ -110,18 +79,17 @@ RUN { \
     echo 'max_execution_time = 300'; \
     echo 'upload_max_filesize = 100M'; \
     echo 'post_max_size = 100M'; \
-} > /usr/local/etc/php/conf.d/custom.ini
-
-RUN mkdir -p /var/lib/php/sessions \
+} > /usr/local/etc/php/conf.d/custom.ini \
+    && mkdir -p /var/lib/php/sessions \
     && chmod 777 /var/lib/php/sessions \
     && chown -R www-data:www-data /var/lib/php/sessions
 
 ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV
+RUN python3 -m venv $VIRTUAL_ENV \
+    && $VIRTUAL_ENV/bin/pip install --upgrade pip \
+    && $VIRTUAL_ENV/bin/pip install huggingface_hub cryptography
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-RUN pip install --upgrade pip && \
-    pip install huggingface_hub cryptography
 
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
 ENV APACHE_LOG_DIR /var/log/apache2
@@ -131,4 +99,4 @@ RUN chmod +x /sync_data.sh
 
 EXPOSE 7860
 
-CMD ["/sync_data.sh"]
+CMD ["/sync_data.sh"]