Mercurial > hg > orthanc-authorization
changeset 50:9ed19ec11f48
fix osimis-viewer route
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Fri, 08 Apr 2022 16:14:02 +0200 |
| parents | a749092170ef |
| children | 6190b564622f |
| files | .hgignore AUTHORS Dockerfile Jenkinsfile NEWS Plugin/DefaultAuthorizationParser.cpp |
| diffstat | 6 files changed, 6 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Fri Apr 08 16:14:02 2022 +0200 @@ -0,0 +1,2 @@ +.vscode/ +ThirdPartyDownloads/ \ No newline at end of file
--- a/AUTHORS Wed Jun 23 09:07:18 2021 +0200 +++ b/AUTHORS Fri Apr 08 16:14:02 2022 +0200 @@ -6,6 +6,6 @@ ------- * Osimis <info@osimis.io> - Rue des Chasseurs Ardennais 3 - 4031 Liege + Quai Banning 6 + 4000 Liège Belgium
--- a/Dockerfile Wed Jun 23 09:07:18 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ - -FROM jodogne/orthanc:1.2.0 - -WORKDIR /root/source - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install \ - libxml++2.6-dev libxml++2.6-doc uuid-dev \ - git \ - python3-dev \ - python3.4-venv \ - python3-pip && \ - rm -rf /var/lib/apt/lists/* - -# Used to copy the plugin to AWS after successful integration tests -RUN pip3 install awscli - -COPY . /root/source/ - -# Build the plugin -RUN mkdir /root/build/ -WORKDIR /root/build -RUN cmake -DALLOW_DOWNLOADS=ON \ - -DSTATIC_BUILD=ON \ - -DCMAKE_BUILD_TYPE=Release \ - /root/source -RUN make "--jobs=$(grep --count ^processor /proc/cpuinfo)" -RUN make install - -ENTRYPOINT [ "Orthanc" ] -CMD [ "/etc/orthanc/" ]
--- a/Jenkinsfile Wed Jun 23 09:07:18 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -try { - node('docker') { - stage 'Retrieve sources' - deleteDir() - checkout scm - - lock(resource: 'orthanc-authorization-plugin', inversePrecedence: false) { - stage 'Build Docker image & run unit tests' - sh 'scripts/ciBuildDockerImage.sh' - } - - withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', credentialsId: 'aws-orthanc.osimis.io']]) { - stage 'Push Docker plugin to AWS' - sh 'scripts/ciPushToAws.sh ${BRANCH_NAME}' - } - } -} -catch (e) { - slackSend color: '#FF0000', message: "${env.JOB_NAME} has failed ${env.JOB_URL}" - throw e -} \ No newline at end of file
--- a/NEWS Wed Jun 23 09:07:18 2021 +0200 +++ b/NEWS Fri Apr 08 16:14:02 2022 +0200 @@ -1,12 +1,11 @@ Pending changes in the mainline =============================== +* Fix osimis-viewer route 2020-12-10 - v 0.2.4 ==================== -NB: This plugin is now deprecated. - * Added support for Osimis Web Viewer new route (osimis-viewer/custom-command/) * Support of dynamic linking against the system-wide Orthanc framework library
--- a/Plugin/DefaultAuthorizationParser.cpp Wed Jun 23 09:07:18 2021 +0200 +++ b/Plugin/DefaultAuthorizationParser.cpp Fri Apr 08 16:14:02 2022 +0200 @@ -124,7 +124,7 @@ } else if (boost::regex_match(uri, what, osimisViewerImages_)) { - AddOrthancInstance(target, what[1]); + AddOrthancInstance(target, what[2]); return true; } else