diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index b2610ea..da656e0 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -10,8 +10,8 @@ RUN cd /home/opencpu && \ apt-get update && \ apt-get install -y openssl && \ openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes \ - -keyout ocpu_ssl.key -out ocpu_ssl.crt -subj "/CN=opencpu.zpid.de" \ - -addext "subjectAltName=DNS:opencpu.zpid.de,DNS:www.opencpu.zpid.de,IP:127.0.0.1" + -keyout ocpu_ssl.key -out ocpu_ssl.crt -subj "/CN=opencpu.stg.zpid.org" \ + -addext "subjectAltName=DNS:opencpu.stg.zpid.org,DNS:www.opencpu.stg.zpid.org,IP:127.0.0.1" RUN cd /home/opencpu && \ mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ @@ -19,13 +19,20 @@ RUN cd /home/opencpu && \ #copy some config files COPY . /home/opencpu/psychOpenCama +COPY .github/workflows/manifests/main/opencpu/index.html /var/www/html/index.html RUN cd /home/opencpu && \ R -e "install.packages('remotes')" && \ R CMD build psychOpenCama && \ mv psychOpenCama_*.tar.gz psychOpenCama_latest.tar.gz && \ # R -e "remotes::install_local('/home/opencpu/psychOpenCama_latest.tar.gz')" - R CMD INSTALL psychOpenCama_latest.tar.gz --library=/usr/local/lib/R/site-library + R CMD INSTALL psychOpenCama_latest.tar.gz --library=/usr/local/lib/R/site-library && \ + chmod 755 /var/www/html/index.html +# touch /etc/ssl/certs/ocpu_ssl.crt && \ +# touch /etc/ssl/private/ocpu_ssl.key && \ +# chmod 644 /etc/ssl/certs/ocpu_ssl.crt && \ +# chmod 400 /etc/ssl/private/ocpu_ssl.key + # Set opencpu password RUN \ diff --git a/.github/workflows/manifests/main/opencpu/index.html b/.github/workflows/manifests/main/opencpu/index.html new file mode 100644 index 0000000..4a3cb21 --- /dev/null +++ b/.github/workflows/manifests/main/opencpu/index.html @@ -0,0 +1,11 @@ + + +
+ + +Nothing to see here, as you can see. view: PsychOpen CAMA
+ + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d11d0b1..0afa913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ Bugs: * included new dataset CAMA_Pharma * added metadata files for new dataset - ## Release 1.0.9 ### 03.2024 Bugs: @@ -17,6 +16,16 @@ Bugs: * added new datasets CAMA_TFP_Reduce, CAMA_TFP_Enhance * added metadata files for all datasets +## Hotfix Release 1.0.7 +### 04.2023 +Sonstiges: +* add index html to static folder +* +## Hotfix Release 1.0.6 +### 04.2023 +Bugs: +* updated Dockerfile, removed static ssl files + ## Hotfix Release 1.0.5 ### 04.2023 Bugs: