From 3971f564ada58e1bc627544e8f669534e1f3bf9a Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Tue, 11 Apr 2023 16:24:00 +0200 Subject: [PATCH 01/11] updated config --- .../manifests/main/opencpu/Dockerfile | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index b2610ea..0032435 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -6,16 +6,16 @@ ARG SSL_KEY RUN apt update -y &&\ apt install -y vim -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" - -RUN cd /home/opencpu && \ - mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ - mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ +#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" + +#RUN cd /home/opencpu && \ +# mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ +# mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ #copy some config files COPY . /home/opencpu/psychOpenCama From 88eb8a544b7f4a5022fac68b536e1dc29915caea Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Tue, 11 Apr 2023 16:53:24 +0200 Subject: [PATCH 02/11] returned to old config --- .../manifests/main/opencpu/Dockerfile | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 0032435..b2610ea 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -6,16 +6,16 @@ ARG SSL_KEY RUN apt update -y &&\ apt install -y vim -#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" - -#RUN cd /home/opencpu && \ -# mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ -# mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ +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" + +RUN cd /home/opencpu && \ + mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ + mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ #copy some config files COPY . /home/opencpu/psychOpenCama From aa6888bbf8ad8699372f351aab4fec01f984ce8b Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 07:30:56 +0200 Subject: [PATCH 03/11] removed static ssl cert again --- .../manifests/main/opencpu/Dockerfile | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index b2610ea..f49d197 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -6,16 +6,16 @@ ARG SSL_KEY RUN apt update -y &&\ apt install -y vim -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" - -RUN cd /home/opencpu && \ - mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ - mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ +#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" +# +#RUN cd /home/opencpu && \ +# mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ +# mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ #copy some config files COPY . /home/opencpu/psychOpenCama From 79d368ee1e56013ded3eb33139dc198518beb384 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 07:32:13 +0200 Subject: [PATCH 04/11] updated changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a51f140..f3ddf2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +## Hotfix Release 1.0.6 +### 04.2023 +Bugs: +* updated Dockerfile, removed static ssl files + ## Hotfix Release 1.0.5 ### 04.2023 Bugs: From 05b145e10157b8fda4b06a22fdfdea679e245a69 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 11:02:56 +0200 Subject: [PATCH 05/11] add index html --- .github/workflows/manifests/main/opencpu/Dockerfile | 1 + .github/workflows/manifests/main/opencpu/index.html | 11 +++++++++++ CHANGELOG.md | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/manifests/main/opencpu/index.html diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index f49d197..76cadc0 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -19,6 +19,7 @@ RUN apt update -y &&\ #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')" && \ 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 @@ + + + + + + Health probe only + + +

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 f3ddf2e..a02251d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ - +## Hotfix Release 1.0.7 +### 04.2023 +Sonstiges: +* add index html to static folder +* ## Hotfix Release 1.0.6 ### 04.2023 Bugs: From 6728921861506b3cea9456334bd4f3373db26d33 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 11:41:27 +0200 Subject: [PATCH 06/11] updated file rights --- .github/workflows/manifests/main/opencpu/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 76cadc0..02679ac 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -26,7 +26,8 @@ RUN cd /home/opencpu && \ 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 -R 755 /var/www/html/index.html # Set opencpu password RUN \ From 9fa1f9600168294492085d01c80e1e3a235f5d61 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 11:59:05 +0200 Subject: [PATCH 07/11] updated main dockerfile --- .github/workflows/manifests/main/opencpu/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 02679ac..52f094a 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -27,7 +27,9 @@ RUN cd /home/opencpu && \ 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 && \ - chmod -R 755 /var/www/html/index.html + chmod 755 /var/www/html/index.html && \ + touch /etc/ssl/certs/ocpu_ssl.crt && \ + touch /etc/ssl/private/ocpu_ssl.key # Set opencpu password RUN \ From f931510747e66b360769a6e5283777152ae419b5 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 12:14:54 +0200 Subject: [PATCH 08/11] updated main dockerfile --- .github/workflows/manifests/main/opencpu/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 52f094a..edc291b 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -29,7 +29,10 @@ RUN cd /home/opencpu && \ 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 + 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 \ From 2e185ae284620eca1be630413aed4f20d7f79149 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 12:21:19 +0200 Subject: [PATCH 09/11] updated main dockerfile --- .../workflows/manifests/main/opencpu/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index edc291b..020652f 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -19,20 +19,20 @@ RUN apt update -y &&\ #copy some config files COPY . /home/opencpu/psychOpenCama -COPY .github/workflows/manifests/main/opencpu/index.html /var/www/html/index.html +#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 && \ - 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 - + 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 \ From 5602fd398f1405f6ae90c33e7810ab61990eb1a0 Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 12:33:04 +0200 Subject: [PATCH 10/11] updated main dockerfile --- .../manifests/main/opencpu/Dockerfile | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 020652f..9fea6be 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -6,20 +6,20 @@ ARG SSL_KEY RUN apt update -y &&\ apt install -y vim -#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" -# -#RUN cd /home/opencpu && \ -# mv /home/opencpu/ocpu_ssl.crt /etc/ssl/certs/ && \ -# mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ +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.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/ && \ + mv /home/opencpu/ocpu_ssl.key /etc/ssl/private/ #copy some config files COPY . /home/opencpu/psychOpenCama -#COPY .github/workflows/manifests/main/opencpu/index.html /var/www/html/index.html +COPY .github/workflows/manifests/main/opencpu/index.html /var/www/html/index.html RUN cd /home/opencpu && \ R -e "install.packages('remotes')" && \ @@ -27,7 +27,7 @@ RUN cd /home/opencpu && \ 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 -# chmod 755 /var/www/html/index.html && \ + 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 && \ From 845f82847f134e627d6f0ecb9ba07fd55494181c Mon Sep 17 00:00:00 2001 From: Robert Studtrucker Date: Wed, 12 Apr 2023 12:35:10 +0200 Subject: [PATCH 11/11] updated main dockerfile --- .github/workflows/manifests/main/opencpu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manifests/main/opencpu/Dockerfile b/.github/workflows/manifests/main/opencpu/Dockerfile index 9fea6be..da656e0 100644 --- a/.github/workflows/manifests/main/opencpu/Dockerfile +++ b/.github/workflows/manifests/main/opencpu/Dockerfile @@ -26,7 +26,7 @@ RUN cd /home/opencpu && \ 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 && \