Revert "Updates docker container to reflect changes to specify7"

This reverts commit 1be89f3.

Author: maxpatiiuk

Dockerfile

@@ -69,9 +69,7 @@ COPY specify7_config /usr/local/specify_config
 
 # Get Specify 7
 RUN cd /usr/local/ \
-	&& git clone https://github.com/specify/specify7/ \
-	&& cd specify7 \
-	&& git checkout workbench-upload
+	&& git clone https://github.com/specify/specify7/
 WORKDIR /usr/local/specify7
 
 # convert line endings
@@ -83,8 +81,7 @@ RUN ln -sf /usr/local/specify_config/local_specify_settings.py ./specifyweb/sett
 
 # install virtual environment
 RUN python3.6 -m venv ve \
-	&& ve/bin/pip install --no-cache-dir -r requirements.txt \
-	&& ve/bin/pip install celery
+	&& ve/bin/pip install --no-cache-dir -r requirements.txt
 
 # copy specify6 installation
 COPY specify6_thick_client /usr/local/specify6
@@ -127,14 +124,12 @@ VOLUME [ "/usr/local/specify_config" ]
 
 # Clone repository
 RUN cd /usr/local/ \
-	&& git clone https://github.com/specify/web-asset-server/ \
-	&& cd web-asset-server \
-	&& git checkout development
+	&& git clone https://github.com/specify/web-asset-server/
 
 WORKDIR /usr/local/web-asset-server/
 
 # Get ExifRead, Paste and sh
-RUN pip3 install -r requirements.txt
+RUN pip install -r requirements.txt
 
 # disable security since container is going to be isolated
 RUN sed -i "s/'test_attachment_key'/None/" settings.py
@@ -145,18 +140,12 @@ RUN sed -i "s/wsgiref/paste/" settings.py
 # change port to 8081
 RUN sed -i "s/8080/8081/" settings.py
 
-# allow ImageMagick to create thumbnails for PDF files
-RUN sed -i "s/<policy domain=\"coder\" rights=\"none\" pattern=\"PDF\" \/>/<policy domain=\"coder\" rights=\"read|write\" pattern=\"PDF\" \/><policy domain=\"coder\" rights=\"read|write\" pattern=\"LABEL\" \/>/" /etc/ImageMagick-6/policy.xml
-
-
-
-# create a direcory for attachments
+# create a direcory for attachments # TODO: test if this is needed <<<<<<<<<<<<<<<<<
 RUN mkdir -p /home/specify/attachments/
 
 
-CMD /etc/init.d/apache2 start -DFOREGROUND \
-	&& python3 server.py
-#CMD ["/usr/sbin/apache2ctl", "-DFOREGROUND"]
+CMD /etc/init.d/apache2 start \
+	&& python server.py
 
 
 

specify7_config/local_specify_settings.py

@@ -19,8 +19,7 @@
 SCHEMA_LANGUAGE = 'en'
 
 # The Specify web attachment server URL.
-#WEB_ATTACHMENT_URL = 'http://localhost:8081/web_asset_store.xml'
-WEB_ATTACHMENT_URL = 'http://host.docker.internal:8081/web_asset_store.xml'
+WEB_ATTACHMENT_URL = 'http://localhost:8081/web_asset_store.xml'
 
 # The Specify web attachment server key.
 WEB_ATTACHMENT_KEY = ''

specify7_config/local_specifyweb_apache.conf

@@ -1,7 +1,6 @@
 <VirtualHost *:80>
         <Directory />
             Require all granted
-            Options +Indexes
         </Directory>
 
         # Alias the following to the location set in specifyweb/settings/local_specify_settings.py