Skip to content

Commit

Permalink
Add Specify 6.8.03 Static Files to Specify 7 (#5266)
Browse files Browse the repository at this point in the history
* add Specify6.8.03 config file to Specify7

* change THICK_CLIENT_LOCATION in settings

* filter out unused files in Specify 7

* config nginx.conf and docker-compose.yml for new config location

* more config files to filter out

* init common geo forms

* Remove invalid compose project `specify6`

* Remove JRXML files

* add specify 6.8.03 jar to config

* use bind mount instead of named volume for config

* DEFAULT_SPECIFY_JAR_PATH

* remove unused accessions files

* add back specify_datamodel.xml

* remove specify jar dependency

* add all specify.jar items into directory

* Revert "add all specify.jar items into directory"

This reverts commit 4784aa9.

* Revert "remove specify jar dependency"

This reverts commit c6fed09.

* let GitHub search for specify.jar 🤷

* wat

* create geology.views.xml

* Update geology.views.xml

* Update geology.views.xml

* Update geology.views.xml

* Add COGs to Common Views, migrate Geology views

* Add Geology viewset registry

* Add geology discipline to Specify 7 list of disciplines

* Remove unused Specify 7 files

* Remove unused/deleted views and appresources from registries

* Improve COJO form and add COG subform

* Update docker-compose.yml

* Revert default THICK_CLIENT_LOCATION

* Add Absolute Age & Relative Age forms

* edit DEFAULT_SPECIFY_JAR_PATH

* COPY config location in Dockerfile

* new find_jar

* config symlink

* dockerfile bug fix

* copy specify-config into static-files volume

* remove unused lines

---------

Co-authored-by: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com>
Co-authored-by: melton-jason <meltonjason12@yahoo.com>
  • Loading branch information
3 people authored Oct 28, 2024
1 parent 0b85e8f commit c9f0342
Show file tree
Hide file tree
Showing 129 changed files with 258,733 additions and 12 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN apt-get update \
python3.8 \
libldap-2.4-2 \
libmariadbclient18 \
rsync \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -68,6 +69,7 @@ COPY --chown=specify:specify manage.py /opt/specify7/
COPY --chown=specify:specify docker-entrypoint.sh /opt/specify7/
COPY --chown=specify:specify Makefile /opt/specify7/
COPY --chown=specify:specify specifyweb.wsgi /opt/specify7/
COPY --chown=specify:specify config /opt/specify7/config

ARG BUILD_VERSION
ARG GIT_SHA
Expand Down
6 changes: 6 additions & 0 deletions config/backstop/app_resources.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<files>
<file level="0" mimetype="text/xml" name="UIFormatters" description="UIFormatters" file="uiformatters.xml"/>
<file level="0" mimetype="text/xml" name="DataObjFormatters" description="DataObjFormatters" file="dataobj_formatters.xml"/>
<file level="0" mimetype="text/xml" name="TypeSearches" description="TypeSearches" file="typesearch_def.xml"/>
</files>
Loading

0 comments on commit c9f0342

Please sign in to comment.