Compare commits
1 Commits
medshake-1
...
medshake-1
| Author | SHA1 | Date | |
|---|---|---|---|
| 66f91619bd |
@@ -75,10 +75,11 @@ SetEnv MEDSHAKEEHRPATH '${MEDSHAKE_SHARE_DIR}
|
|||||||
|
|
||||||
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
||||||
&& urpmi.update -a \
|
&& urpmi.update -a \
|
||||||
&& urpmi --force wget ssmtp ghostscript pdftk-java php-posix php-bcmath php-curl php-gd php-gnupg php-soap php-yaml php-zip php-phar php-dom php-iconv php-fileinfo php-xmlreader composer git lib64opencl1 \
|
&& urpmi --force wget ssmtp ghostscript pdftk-java php-posix php-bcmath php-curl php-gd php-gnupg php-soap php-yaml php-zip php-phar php-dom php-iconv php-fileinfo php-xmlreader composer git lib64opencl1 imagemagick dcmtk \
|
||||||
&& mkdir /tmp/medshake \
|
&& mkdir /tmp/medshake \
|
||||||
&& wget -q -O - https://github.com/MedShake/MedShakeEHR-base/archive/refs/tags/v8.4.2.tar.gz | tar xzvf - -C /tmp/medshake \
|
&& wget -q -O - https://github.com/MedShake/MedShakeEHR-base/archive/refs/tags/v8.4.2.tar.gz | tar xzvf - -C /tmp/medshake \
|
||||||
&& mv /tmp/medshake/* ${MEDSHAKE_WWW_DIR}.ref \
|
&& mv /tmp/medshake/* ${MEDSHAKE_WWW_DIR}.ref \
|
||||||
|
&& for dir in inboxArchives public_html/workingDirectory/C public_html/workingDirectory/NC; do mkdir -p ${MEDSHAKE_WWW_DIR}.ref/$dir; done \
|
||||||
&& COMPOSER_ALLOW_SUPERUSER=1 composer install --working-dir ${MEDSHAKE_WWW_DIR}.ref --no-interaction --no-cache -o \
|
&& COMPOSER_ALLOW_SUPERUSER=1 composer install --working-dir ${MEDSHAKE_WWW_DIR}.ref --no-interaction --no-cache -o \
|
||||||
&& COMPOSER_ALLOW_SUPERUSER=1 composer install --working-dir ${MEDSHAKE_WWW_DIR}.ref/public_html --no-interaction --no-cache -o \
|
&& COMPOSER_ALLOW_SUPERUSER=1 composer install --working-dir ${MEDSHAKE_WWW_DIR}.ref/public_html --no-interaction --no-cache -o \
|
||||||
&& rmdir /tmp/medshake \
|
&& rmdir /tmp/medshake \
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ Welcome to Rx3-Docker/MedShake docker image!
|
|||||||
This project aims to build a MedShake EHR docker image.
|
This project aims to build a MedShake EHR docker image.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/php-apache:1.7.0-mga9 & rx3-docker/mariadb:1.2.0-mga9 images,
|
- Curtently based on rx3-docker/php-apache:1.7.0-mga9, rx3-docker/orthanc-1.0.0-mga9 & rx3-docker/mariadb:1.2.0-mga9 images,
|
||||||
- Sync with Orthanc Rx3 RPM 8.4.2.
|
- Sync with MedShake EHR Rx3 RPM 8.4.2.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,12 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/MedShake V 1.1.0 - A. GIBERT - 2026/09/07
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Now use rx3-docker/orthanc-1.0.0-mga9 image,
|
||||||
|
- Add dcmtk and imagemagick package to medshake image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/MedShake V 1.0.0 - A. GIBERT - 2026/06/25
|
Rx3-Docker/MedShake V 1.0.0 - A. GIBERT - 2026/06/25
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
34
compose.yaml
34
compose.yaml
@@ -42,6 +42,40 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
server:
|
||||||
|
container_name: ${SV_HOST_NAME}
|
||||||
|
hostname: ${SV_HOST_NAME}
|
||||||
|
|
||||||
|
image: ${SV_IMG_URL}
|
||||||
|
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
environment:
|
||||||
|
SERVER_CROND_ENABLED: ${SV_CROND_ENABLED}
|
||||||
|
ORTHANC_UID: ${SV_USER_ID}
|
||||||
|
ORTHANC_GID: ${SV_GROUP_ID}
|
||||||
|
ORTHANC_USER: ${SV_APPL_USER}
|
||||||
|
ORTHANC_PASSWORD: ${SV_APPL_PASSWORD}
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- ./${SV_LOG_INIT_EXT}:${SV_LOG_INIT_INT}
|
||||||
|
- ./${SV_LOG_SV_EXT}:${SV_LOG_SV_INT}
|
||||||
|
- ./${SV_LOG_MAIN_EXT}:${SV_LOG_MAIN_INT}
|
||||||
|
- ./${SV_CONF_EXT}:${SV_CONF_INT}
|
||||||
|
- ./${SV_DATA_EXT}:${SV_DATA_INT}
|
||||||
|
|
||||||
|
networks:
|
||||||
|
- appl
|
||||||
|
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:${SV_PORT_SV_EXT}:${SV_PORT_SV_INT}"
|
||||||
|
- "127.0.0.1:${SV_PORT_MAIN_EXT}:${SV_PORT_MAIN_INT}"
|
||||||
|
- "127.0.0.1:${SV_PORT_DATA_EXT}:${SV_PORT_DATA_INT}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
webapp:
|
webapp:
|
||||||
|
|||||||
23
env.dist
23
env.dist
@@ -21,7 +21,7 @@ APPL_NAME="medshake"
|
|||||||
APPL_NAME_FULL="MedShake Server"
|
APPL_NAME_FULL="MedShake Server"
|
||||||
APPL_NAME_SHORT="medshake"
|
APPL_NAME_SHORT="medshake"
|
||||||
APPL_ORG="rx3-docker"
|
APPL_ORG="rx3-docker"
|
||||||
APPL_VERSION="1.0.1"
|
APPL_VERSION="1.1.0"
|
||||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
|
|
||||||
@@ -77,6 +77,7 @@ DOCKER_TOOLS_VOLUME=MIXED
|
|||||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||||
|
|
||||||
docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.2.0-mga9 - - - mysql - - 3306 - - mysql mysql
|
docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.2.0-mga9 - - - mysql - - 3306 - - mysql mysql
|
||||||
|
docker_service_add SV server ${ORG_URL_PREFIX} orthanc - 1.0.0-mga9 - - - - - 8042 8042 - - apache apache
|
||||||
|
|
||||||
docker_service_add WA webapp ${ORG_URL_PREFIX} medshake "Rx3-Docker/MedShake" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8178 80 - - apache apache
|
docker_service_add WA webapp ${ORG_URL_PREFIX} medshake "Rx3-Docker/MedShake" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8178 80 - - apache apache
|
||||||
|
|
||||||
@@ -96,6 +97,26 @@ DB_SERVER_NAME="MedShake"
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
# Server
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SV_CROND_ENABLED="FALSE"
|
||||||
|
|
||||||
|
SV_CONF_EXT=./etc/orthanc
|
||||||
|
SV_CONF_INT=/etc/orthanc
|
||||||
|
|
||||||
|
SV_DATA_EXT=./var/lib/orthanc
|
||||||
|
SV_DATA_INT=/var/lib/orthanc
|
||||||
|
|
||||||
|
SV_PORT_DATA_EXT=4242
|
||||||
|
SV_PORT_DATA_INT=4242
|
||||||
|
|
||||||
|
SV_APPL_USER="orthanc"
|
||||||
|
SV_APPL_PASSWORD="orthancadmin"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# WebApp
|
# WebApp
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|||||||
4
var/lib/mysql/.gitignore
vendored
4
var/lib/mysql/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
4
var/log/httpd-webapp/.gitignore
vendored
4
var/log/httpd-webapp/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
4
var/log/init-database/.gitignore
vendored
4
var/log/init-database/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
4
var/log/init-webapp/.gitignore
vendored
4
var/log/init-webapp/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
4
var/log/supervisor-database/.gitignore
vendored
4
var/log/supervisor-database/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
4
var/log/supervisor-webapp/.gitignore
vendored
4
var/log/supervisor-webapp/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Ignore everything in this directory
|
|
||||||
*
|
|
||||||
# Except this file
|
|
||||||
!.gitignore
|
|
||||||
Reference in New Issue
Block a user