Skip to content

Commit

Permalink
Merge pull request #1 from phoenixctms/release_170
Browse files Browse the repository at this point in the history
prepare 1.7.0 release
  • Loading branch information
rkrenn authored Nov 18, 2020
2 parents 1914381 + e7b1ac4 commit aebd2dc
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.bak
4 changes: 2 additions & 2 deletions dbsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ CRON_PASSWORD=$(pwgen 24 1)
# ./render.sh
# cd /ctsms/build/ctsms
# mvn -f web/pom.xml -Dmaven.test.skip=true
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.6.9.war
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.7.0.war
# systemctl stop tomcat8
# rm /var/lib/tomcat8/webapps/ROOT/ -rf
# cp /ctsms/build/ctsms/web/target/ctsms-1.6.9.war /var/lib/tomcat8/webapps/ROOT.war
# cp /ctsms/build/ctsms/web/target/ctsms-1.7.0.war /var/lib/tomcat8/webapps/ROOT.war


echo "Initial database setup complete."
Expand Down
80 changes: 80 additions & 0 deletions dbsetup.sh.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/ctsms/dbtool.sh -i -f
/ctsms/dbtool.sh -icp /ctsms/master_data/criterion_property_definitions.csv
/ctsms/dbtool.sh -ipd /ctsms/master_data/permission_definitions.csv
/ctsms/dbtool.sh -imi /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -ims /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imc /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imt /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imp /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -immm /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imifi /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imsi /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -impi /ctsms/master_data/mime.types -e ISO-8859-1
/ctsms/dbtool.sh -imjf /ctsms/master_data/mime.types -e ISO-8859-1

/ctsms/dbtool.sh -it /ctsms/master_data/titles.csv -e ISO-8859-1
/ctsms/dbtool.sh -ib /ctsms/master_data/kiverzeichnis_gesamt_de_1347893202433.csv -e ISO-8859-1
/ctsms/dbtool.sh -ic /ctsms/master_data/countries.txt -e ISO-8859-1
/ctsms/dbtool.sh -iz /ctsms/master_data/streetnames.csv -e utf-8
/ctsms/dbtool.sh -is /ctsms/master_data/streetnames.csv -e utf-8

/ctsms/dbtool.sh -iis /ctsms/master_data/icd10gm2012syst_claml_20110923.xml -sl de
/ctsms/dbtool.sh -iai /ctsms/master_data/icd10gm2012_alphaid_edv_ascii_20110930.txt -e ISO-8859-1 -isr icd10gm2012syst_claml_20110923
/ctsms/dbtool.sh -ios /ctsms/master_data/ops2012syst_claml_20111103.xml -sl de
/ctsms/dbtool.sh -ioc /ctsms/master_data/ops2011alpha_edv_ascii_20111031.txt -osr ops2012syst_claml_20111103
/ctsms/dbtool.sh -ia /ctsms/master_data/asp_register_20181005.xls

DEPARTMENT_PASSWORD=$(pwgen 24 1)
USER_PASSWORD=$(pwgen 24 1)
/ctsms/dbtool.sh -cd -dlk my_department -dp "$DEPARTMENT_PASSWORD"
/ctsms/dbtool.sh -cu -dlk my_department -dp "$DEPARTMENT_PASSWORD" -u "phoenix" -p "$USER_PASSWORD" -pp "INVENTORY_MASTER_ALL_DEPARTMENTS,STAFF_MASTER_ALL_DEPARTMENTS,COURSE_MASTER_ALL_DEPARTMENTS,TRIAL_MASTER_ALL_DEPARTMENTS,PROBAND_MASTER_ALL_DEPARTMENTS,USER_ALL_DEPARTMENTS,INPUT_FIELD_MASTER,MASS_MAIL_MASTER_ALL_DEPARTMENTS,INVENTORY_MASTER_SEARCH,STAFF_MASTER_SEARCH,COURSE_MASTER_SEARCH,TRIAL_MASTER_SEARCH,PROBAND_MASTER_SEARCH,USER_MASTER_SEARCH,INPUT_FIELD_MASTER_SEARCH,MASS_MAIL_MASTER_SEARCH"

/ctsms/dbtool.sh -cu -dlk my_department -dp "$DEPARTMENT_PASSWORD" -u "my_department_signup_de" -p "my_department_signup_de" -ul de -pp "INVENTORY_VIEW_USER_DEPARTMENT,STAFF_DETAIL_IDENTITY,COURSE_VIEW_USER_DEPARTMENT,TRIAL_SIGNUP,PROBAND_SIGNUP,USER_ACTIVE_USER,INPUT_FIELD_VIEW,MASS_MAIL_SIGNUP,INVENTORY_NO_SEARCH,STAFF_NO_SEARCH,COURSE_NO_SEARCH,TRIAL_NO_SEARCH,PROBAND_NO_SEARCH,USER_NO_SEARCH,INPUT_FIELD_NO_SEARCH,MASS_MAIL_NO_SEARCH"
/ctsms/dbtool.sh -cu -dlk my_department -dp "$DEPARTMENT_PASSWORD" -u "my_department_signup_en" -p "my_department_signup_en" -ul en -pp "INVENTORY_VIEW_USER_DEPARTMENT,STAFF_DETAIL_IDENTITY,COURSE_VIEW_USER_DEPARTMENT,TRIAL_SIGNUP,PROBAND_SIGNUP,USER_ACTIVE_USER,INPUT_FIELD_VIEW,MASS_MAIL_SIGNUP,INVENTORY_NO_SEARCH,STAFF_NO_SEARCH,COURSE_NO_SEARCH,TRIAL_NO_SEARCH,PROBAND_NO_SEARCH,USER_NO_SEARCH,INPUT_FIELD_NO_SEARCH,MASS_MAIL_NO_SEARCH"

CRON_PASSWORD=$(pwgen 24 1)
/ctsms/dbtool.sh -cu -dlk my_department -dp "$DEPARTMENT_PASSWORD" -u "my_department_cron" -p "$CRON_PASSWORD" -pp "INVENTORY_MASTER_ALL_DEPARTMENTS,STAFF_MASTER_ALL_DEPARTMENTS,COURSE_MASTER_ALL_DEPARTMENTS,TRIAL_MASTER_ALL_DEPARTMENTS,PROBAND_MASTER_ALL_DEPARTMENTS,USER_ALL_DEPARTMENTS,INPUT_FIELD_MASTER,MASS_MAIL_MASTER_ALL_DEPARTMENTS,INVENTORY_MASTER_SEARCH,STAFF_MASTER_SEARCH,COURSE_MASTER_SEARCH,TRIAL_MASTER_SEARCH,PROBAND_MASTER_SEARCH,USER_MASTER_SEARCH,INPUT_FIELD_MASTER_SEARCH,MASS_MAIL_MASTER_SEARCH"

# FIXME: set up bulk processor

# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Criteria/config.cfg
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Duplicates/config.cfg
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/EcrfExporter/config.cfg
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/InquiryExporter/config.cfg
# IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/EcrfExporter/settings.yml
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/InquiryExporter/settings.yml
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/WebApps/Signup/settings.yml

# FIXME - cron container?

# ###setup cron
# wget https://raw.githubusercontent.com/phoenixctms/install-debian/master/cron/ctsms -O /etc/cron.d/ctsms
# chown root:root /etc/cron.d/ctsms
# chmod 644 /etc/cron.d/ctsms
# wget https://raw.githubusercontent.com/phoenixctms/install-debian/master/cron/my_department -O /etc/cron.d/my_department
# chown root:root /etc/cron.d/my_department
# chmod 644 /etc/cron.d/my_department
# sed -r -i "s|-u cron -p 12345|-u my_department_cron -p ${CRON_PASSWORD}|" /etc/cron.d/my_department
# systemctl restart cron

# ###create some default queries/reports
# cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Criteria
# perl process.pl --task=create_criteria --force --skip-errors

# ###render workflow state diagram images from db and include them for tooltips
# cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/Render
# ./render.sh
# cd /ctsms/build/ctsms
# mvn -f web/pom.xml -Dmaven.test.skip=true
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.6.9.war
# systemctl stop tomcat8
# rm /var/lib/tomcat8/webapps/ROOT/ -rf
# cp /ctsms/build/ctsms/web/target/ctsms-1.6.9.war /var/lib/tomcat8/webapps/ROOT.war


echo "Initial database setup complete."
echo
echo "USER_PASSWORD: $USER_PASSWORD"
echo "DEPARTMENT_PASSWORD: $DEPARTMENT_PASSWORD"
echo "CRON_PASSWORD: $CRON_PASSWORD"
2 changes: 1 addition & 1 deletion phoenix/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y pwgen \
&& rm -rf /var/lib/apt/lists/*

COPY --from=javabuild /ctsms /ctsms
COPY --from=javabuild /ctsms/war/ctsms-1.6.9.war /usr/local/tomcat/webapps/ROOT.war
COPY --from=javabuild /ctsms/war/ctsms-1.7.0.war /usr/local/tomcat/webapps/ROOT.war

# prepare /ctsms directory with default-config and master-data
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/dbtool.sh -O /ctsms/dbtool.sh
Expand Down
50 changes: 50 additions & 0 deletions phoenix/Dockerfile.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
FROM debian:stretch AS javabuild

RUN apt-get update && apt-get install -y \
openjdk-8-jdk \
git \
maven \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /ctsms/build
RUN cd /ctsms/build && \
git clone https://github.com/phoenixctms/ctsms
RUN cd /ctsms/build/ctsms && \
mvn install -DskipTests && \
mvn -f core/pom.xml org.andromda.maven.plugins:andromdapp-maven-plugin:schema -Dtasks=create && \
mvn -f core/pom.xml org.andromda.maven.plugins:andromdapp-maven-plugin:schema -Dtasks=drop

RUN mkdir /ctsms/war/
RUN cp /ctsms/build/ctsms/web/target/*.war /ctsms/war/
RUN rm -rf /ctsms/build/

FROM tomcat:8 as runtime

RUN apt-get update && apt-get install -y pwgen \
&& rm -rf /var/lib/apt/lists/*

COPY --from=javabuild /ctsms /ctsms
COPY --from=javabuild /ctsms/war/ctsms-1.6.9.war /usr/local/tomcat/webapps/ROOT.war

# prepare /ctsms directory with default-config and master-data
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/dbtool.sh -O /ctsms/dbtool.sh
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/clearcache.sh -O /ctsms/clearcache.sh
RUN wget -q --content-disposition https://github.com/phoenixctms/config-default/archive/master.tar.gz -O /ctsms/config.tar.gz \
&& tar xzf /ctsms/config.tar.gz -C /ctsms --strip-components 1 \
&& rm /ctsms/config.tar.gz
RUN wget -q https://api.github.com/repos/phoenixctms/master-data/tarball/master -O /ctsms/master-data.tar.gz \
&& mkdir /ctsms/master_data \
&& tar xzf /ctsms/master-data.tar.gz -C /ctsms/master_data --strip-components 1 \
&& rm /ctsms/master-data.tar.gz
RUN chmod a+x /ctsms/dbtool.sh /ctsms/clearcache.sh

RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/tomcat/workers.properties -O "/usr/local/tomcat/conf/workers.properties"
RUN chmod 640 "/usr/local/tomcat/conf/workers.properties"

ENV CTSMS_PROPERTIES /ctsms/properties
ENV CTSMS_JAVA /ctsms/java
ENV CATALINA_BASE /usr/local/tomcat

COPY docker-entrypoint.sh /
RUN chmod +x /docker-entrypoint.sh
ENTRYPOINT [ "/docker-entrypoint.sh" ]

0 comments on commit aebd2dc

Please sign in to comment.