Skip to content

Commit e7b1ac4

Browse files
rkrennrkrenn
committed
prepare 1.7.0 release
1 parent 1914381 commit e7b1ac4

5 files changed

Lines changed: 134 additions & 3 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.bak

‎dbsetup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ CRON_PASSWORD=$(pwgen 24 1)
6767
# ./render.sh
6868
# cd /ctsms/build/ctsms
6969
# mvn -f web/pom.xml -Dmaven.test.skip=true
70-
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.6.9.war
70+
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.7.0.war
7171
# systemctl stop tomcat8
7272
# rm /var/lib/tomcat8/webapps/ROOT/ -rf
73-
# cp /ctsms/build/ctsms/web/target/ctsms-1.6.9.war /var/lib/tomcat8/webapps/ROOT.war
73+
# cp /ctsms/build/ctsms/web/target/ctsms-1.7.0.war /var/lib/tomcat8/webapps/ROOT.war
7474

7575

7676
echo "Initial database setup complete."

‎dbsetup.sh.bak‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/ctsms/dbtool.sh -i -f
2+
/ctsms/dbtool.sh -icp /ctsms/master_data/criterion_property_definitions.csv
3+
/ctsms/dbtool.sh -ipd /ctsms/master_data/permission_definitions.csv
4+
/ctsms/dbtool.sh -imi /ctsms/master_data/mime.types -e ISO-8859-1
5+
/ctsms/dbtool.sh -ims /ctsms/master_data/mime.types -e ISO-8859-1
6+
/ctsms/dbtool.sh -imc /ctsms/master_data/mime.types -e ISO-8859-1
7+
/ctsms/dbtool.sh -imt /ctsms/master_data/mime.types -e ISO-8859-1
8+
/ctsms/dbtool.sh -imp /ctsms/master_data/mime.types -e ISO-8859-1
9+
/ctsms/dbtool.sh -immm /ctsms/master_data/mime.types -e ISO-8859-1
10+
/ctsms/dbtool.sh -imifi /ctsms/master_data/mime.types -e ISO-8859-1
11+
/ctsms/dbtool.sh -imsi /ctsms/master_data/mime.types -e ISO-8859-1
12+
/ctsms/dbtool.sh -impi /ctsms/master_data/mime.types -e ISO-8859-1
13+
/ctsms/dbtool.sh -imjf /ctsms/master_data/mime.types -e ISO-8859-1
14+
15+
/ctsms/dbtool.sh -it /ctsms/master_data/titles.csv -e ISO-8859-1
16+
/ctsms/dbtool.sh -ib /ctsms/master_data/kiverzeichnis_gesamt_de_1347893202433.csv -e ISO-8859-1
17+
/ctsms/dbtool.sh -ic /ctsms/master_data/countries.txt -e ISO-8859-1
18+
/ctsms/dbtool.sh -iz /ctsms/master_data/streetnames.csv -e utf-8
19+
/ctsms/dbtool.sh -is /ctsms/master_data/streetnames.csv -e utf-8
20+
21+
/ctsms/dbtool.sh -iis /ctsms/master_data/icd10gm2012syst_claml_20110923.xml -sl de
22+
/ctsms/dbtool.sh -iai /ctsms/master_data/icd10gm2012_alphaid_edv_ascii_20110930.txt -e ISO-8859-1 -isr icd10gm2012syst_claml_20110923
23+
/ctsms/dbtool.sh -ios /ctsms/master_data/ops2012syst_claml_20111103.xml -sl de
24+
/ctsms/dbtool.sh -ioc /ctsms/master_data/ops2011alpha_edv_ascii_20111031.txt -osr ops2012syst_claml_20111103
25+
/ctsms/dbtool.sh -ia /ctsms/master_data/asp_register_20181005.xls
26+
27+
DEPARTMENT_PASSWORD=$(pwgen 24 1)
28+
USER_PASSWORD=$(pwgen 24 1)
29+
/ctsms/dbtool.sh -cd -dlk my_department -dp "$DEPARTMENT_PASSWORD"
30+
/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"
31+
32+
/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"
33+
/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"
34+
35+
CRON_PASSWORD=$(pwgen 24 1)
36+
/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"
37+
38+
# FIXME: set up bulk processor
39+
40+
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Criteria/config.cfg
41+
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Duplicates/config.cfg
42+
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/EcrfExporter/config.cfg
43+
# sed -r -i "s|ctsmsrestapi_password.*|ctsmsrestapi_password = ${CRON_PASSWORD}|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/InquiryExporter/config.cfg
44+
# IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
45+
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/EcrfExporter/settings.yml
46+
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/InquiryExporter/settings.yml
47+
# sed -r -i "s|ctsms_base_uri.*|ctsms_base_uri: 'https://${IP}'|" /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/WebApps/Signup/settings.yml
48+
49+
# FIXME - cron container?
50+
51+
# ###setup cron
52+
# wget https://raw.githubusercontent.com/phoenixctms/install-debian/master/cron/ctsms -O /etc/cron.d/ctsms
53+
# chown root:root /etc/cron.d/ctsms
54+
# chmod 644 /etc/cron.d/ctsms
55+
# wget https://raw.githubusercontent.com/phoenixctms/install-debian/master/cron/my_department -O /etc/cron.d/my_department
56+
# chown root:root /etc/cron.d/my_department
57+
# chmod 644 /etc/cron.d/my_department
58+
# sed -r -i "s|-u cron -p 12345|-u my_department_cron -p ${CRON_PASSWORD}|" /etc/cron.d/my_department
59+
# systemctl restart cron
60+
61+
# ###create some default queries/reports
62+
# cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/ETL/Criteria
63+
# perl process.pl --task=create_criteria --force --skip-errors
64+
65+
# ###render workflow state diagram images from db and include them for tooltips
66+
# cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/Render
67+
# ./render.sh
68+
# cd /ctsms/build/ctsms
69+
# mvn -f web/pom.xml -Dmaven.test.skip=true
70+
# chmod 755 /ctsms/build/ctsms/web/target/ctsms-1.6.9.war
71+
# systemctl stop tomcat8
72+
# rm /var/lib/tomcat8/webapps/ROOT/ -rf
73+
# cp /ctsms/build/ctsms/web/target/ctsms-1.6.9.war /var/lib/tomcat8/webapps/ROOT.war
74+
75+
76+
echo "Initial database setup complete."
77+
echo
78+
echo "USER_PASSWORD: $USER_PASSWORD"
79+
echo "DEPARTMENT_PASSWORD: $DEPARTMENT_PASSWORD"
80+
echo "CRON_PASSWORD: $CRON_PASSWORD"

‎phoenix/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y pwgen \
2424
&& rm -rf /var/lib/apt/lists/*
2525

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

2929
# prepare /ctsms directory with default-config and master-data
3030
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/dbtool.sh -O /ctsms/dbtool.sh

‎phoenix/Dockerfile.bak‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM debian:stretch AS javabuild
2+
3+
RUN apt-get update && apt-get install -y \
4+
openjdk-8-jdk \
5+
git \
6+
maven \
7+
&& rm -rf /var/lib/apt/lists/*
8+
9+
RUN mkdir -p /ctsms/build
10+
RUN cd /ctsms/build && \
11+
git clone https://github.com/phoenixctms/ctsms
12+
RUN cd /ctsms/build/ctsms && \
13+
mvn install -DskipTests && \
14+
mvn -f core/pom.xml org.andromda.maven.plugins:andromdapp-maven-plugin:schema -Dtasks=create && \
15+
mvn -f core/pom.xml org.andromda.maven.plugins:andromdapp-maven-plugin:schema -Dtasks=drop
16+
17+
RUN mkdir /ctsms/war/
18+
RUN cp /ctsms/build/ctsms/web/target/*.war /ctsms/war/
19+
RUN rm -rf /ctsms/build/
20+
21+
FROM tomcat:8 as runtime
22+
23+
RUN apt-get update && apt-get install -y pwgen \
24+
&& rm -rf /var/lib/apt/lists/*
25+
26+
COPY --from=javabuild /ctsms /ctsms
27+
COPY --from=javabuild /ctsms/war/ctsms-1.6.9.war /usr/local/tomcat/webapps/ROOT.war
28+
29+
# prepare /ctsms directory with default-config and master-data
30+
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/dbtool.sh -O /ctsms/dbtool.sh
31+
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/clearcache.sh -O /ctsms/clearcache.sh
32+
RUN wget -q --content-disposition https://github.com/phoenixctms/config-default/archive/master.tar.gz -O /ctsms/config.tar.gz \
33+
&& tar xzf /ctsms/config.tar.gz -C /ctsms --strip-components 1 \
34+
&& rm /ctsms/config.tar.gz
35+
RUN wget -q https://api.github.com/repos/phoenixctms/master-data/tarball/master -O /ctsms/master-data.tar.gz \
36+
&& mkdir /ctsms/master_data \
37+
&& tar xzf /ctsms/master-data.tar.gz -C /ctsms/master_data --strip-components 1 \
38+
&& rm /ctsms/master-data.tar.gz
39+
RUN chmod a+x /ctsms/dbtool.sh /ctsms/clearcache.sh
40+
41+
RUN wget -q https://raw.githubusercontent.com/phoenixctms/install-debian/master/tomcat/workers.properties -O "/usr/local/tomcat/conf/workers.properties"
42+
RUN chmod 640 "/usr/local/tomcat/conf/workers.properties"
43+
44+
ENV CTSMS_PROPERTIES /ctsms/properties
45+
ENV CTSMS_JAVA /ctsms/java
46+
ENV CATALINA_BASE /usr/local/tomcat
47+
48+
COPY docker-entrypoint.sh /
49+
RUN chmod +x /docker-entrypoint.sh
50+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

0 commit comments

Comments
 (0)