瀏覽代碼

Move Dockerfiles to contrib/

Pierre Jaury 6 年之前
父節點
當前提交
5224d7cd96
共有 6 個文件被更改,包括 6 次插入3 次删除
  1. 1 0
      .dockerignore
  2. 1 1
      Dockerfile
  3. 4 2
      contrib/docker/Dockerfile.apache
  4. 0 0
      contrib/docker/Dockerfile.fpm
  5. 0 0
      contrib/docker/php.ini
  6. 0 0
      contrib/docker/start.sh

+ 1 - 0
.dockerignore

@@ -1,4 +1,5 @@
 data
+contrib
 Dockerfile
 docker-compose*.yml
 .dockerignore

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-docker/Dockerfile.apache
+contrib/docker/Dockerfile.apache

+ 4 - 2
docker/Dockerfile.apache → contrib/docker/Dockerfile.apache

@@ -32,10 +32,12 @@ COPY . /var/www/
 
 WORKDIR /var/www/
 RUN cp -r storage storage.skel \
- && cp /var/www/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
  && composer install --prefer-source --no-interaction \
  && rm -rf html && ln -s public html
 
+COPY contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini
+COPY contrib/docker/start.sh /start.sh
+
 VOLUME ["/var/www/storage"]
 
 ENV APP_ENV=production \
@@ -56,4 +58,4 @@ ENV APP_ENV=production \
     REMOTE_FOLLOW=false \
     ACTIVITY_PUB=false
 
-CMD /var/www/docker/start.sh
+CMD /start.sh

+ 0 - 0
docker/Dockerfile.fpm → contrib/docker/Dockerfile.fpm


+ 0 - 0
docker/php.ini → contrib/docker/php.ini


+ 0 - 0
docker/start.sh → contrib/docker/start.sh