changeset 8:dac0f23f85c2

rename
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 31 Mar 2020 12:15:46 +0200
parents 0dc2054fe777
children 8ec973ae8d6c
files Resources/Builders/DebianStable/Dockerfile-BuildEnvironment Resources/Builders/DebianStable/Dockerfile-Release Resources/Builders/DebianStable/NOTES.txt Resources/Builders/DebianStable/docker-compile.sh Resources/Builders/DebianStable/docker-internal.sh Resources/Builders/LinuxStandardBase/Dockerfile-BuildEnvironment Resources/Builders/LinuxStandardBase/Dockerfile-Release Resources/Builders/LinuxStandardBase/NOTES.txt Resources/Builders/LinuxStandardBase/docker-compile.sh Resources/Builders/LinuxStandardBase/docker-internal.sh
diffstat 10 files changed, 81 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Builders/DebianStable/Dockerfile-BuildEnvironment	Tue Mar 31 12:15:46 2020 +0200
@@ -0,0 +1,9 @@
+FROM debian:stable-slim
+
+MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
+LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
+
+RUN apt-get -y clean && apt-get -y update
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    nano build-essential unzip cmake pkg-config libpython3.7-dev && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Builders/DebianStable/Dockerfile-Release	Tue Mar 31 12:15:46 2020 +0200
@@ -0,0 +1,11 @@
+FROM jodogne/orthanc-plugins:1.6.0
+
+MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
+LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
+
+RUN apt-get -y clean && apt-get -y update
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7 libpython3.7 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+ADD ./docker-build/share/orthanc/plugins/libOrthancPython.so \
+    /usr/local/share/orthanc/plugins/libOrthancPython.so
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Builders/DebianStable/NOTES.txt	Tue Mar 31 12:15:46 2020 +0200
@@ -0,0 +1,12 @@
+
+
+Create the Docker image:
+
+$ ./docker-compile.sh Release
+$ docker build -f Dockerfile-Release -t python-plugin ../../..
+
+
+Run the just-created Docker image:
+
+$ docker run -p 4242:4242 -p 8042:8042 --rm python-plugin
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Builders/DebianStable/docker-compile.sh	Tue Mar 31 12:15:46 2020 +0200
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -ex
+
+if [ "$1" != "Debug" -a "$1" != "Release" ]; then
+    echo "Please provide build type: Debug or Release"
+    exit -1
+fi
+
+if [ -t 1 ]; then
+    # TTY is available => use interactive mode
+    DOCKER_FLAGS='-i'
+fi
+
+ROOT_DIR=`dirname $(readlink -f $0)`/../../..
+
+mkdir -p ${ROOT_DIR}/docker-build/
+
+docker build \
+       -f ${ROOT_DIR}/Resources/Builders/DebianStable/Dockerfile-BuildEnvironment \
+       -t debian-stable-python-build .
+
+docker run -t ${DOCKER_FLAGS} --rm \
+    --user $(id -u):$(id -g) \
+    -v ${ROOT_DIR}:/source:ro \
+    -v ${ROOT_DIR}/docker-build:/target:rw \
+    debian-stable-python-build \
+    bash /source/Resources/Builders/DebianStable/docker-internal.sh $1
+
+ls -lR ${ROOT_DIR}/docker-build/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Builders/DebianStable/docker-internal.sh	Tue Mar 31 12:15:46 2020 +0200
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -ex
+
+mkdir /tmp/build
+cd /tmp/build
+
+cmake /source \
+      -DCMAKE_BUILD_TYPE=$1 \
+      -DPYTHON_VERSION=3.7 \
+      -DSTATIC_BUILD=ON \
+      -DCMAKE_INSTALL_PREFIX=/target 
+
+make -j`nproc`
+
+if [ "$1" == "Release" ]; then
+    strip ./libOrthancPython.so
+fi
+
+make install
--- a/Resources/Builders/LinuxStandardBase/Dockerfile-BuildEnvironment	Tue Mar 31 10:48:49 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-FROM debian:stable-slim
-
-MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
-LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
-
-RUN apt-get -y clean && apt-get -y update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    nano build-essential unzip cmake pkg-config libpython3.7-dev && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
--- a/Resources/Builders/LinuxStandardBase/Dockerfile-Release	Tue Mar 31 10:48:49 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-FROM jodogne/orthanc-plugins:1.6.0
-
-MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
-LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
-
-RUN apt-get -y clean && apt-get -y update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7 libpython3.7 && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD ./docker-build/share/orthanc/plugins/libOrthancPython.so \
-    /usr/local/share/orthanc/plugins/libOrthancPython.so
--- a/Resources/Builders/LinuxStandardBase/NOTES.txt	Tue Mar 31 10:48:49 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-
-
-Create the Docker image:
-
-$ ./docker-compile.sh Release
-$ docker build -f Dockerfile-Release -t python-plugin ../../..
-
-
-Run the just-created Docker image:
-
-$ docker run -p 4242:4242 -p 8042:8042 --rm python-plugin
-
--- a/Resources/Builders/LinuxStandardBase/docker-compile.sh	Tue Mar 31 10:48:49 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-if [ "$1" != "Debug" -a "$1" != "Release" ]; then
-    echo "Please provide build type: Debug or Release"
-    exit -1
-fi
-
-if [ -t 1 ]; then
-    # TTY is available => use interactive mode
-    DOCKER_FLAGS='-i'
-fi
-
-ROOT_DIR=`dirname $(readlink -f $0)`/../../..
-
-mkdir -p ${ROOT_DIR}/docker-build/
-
-docker build \
-       -f ${ROOT_DIR}/Resources/Builders/LinuxStandardBase/Dockerfile-BuildEnvironment \
-       -t debian-stable-python-build .
-
-docker run -t ${DOCKER_FLAGS} --rm \
-    --user $(id -u):$(id -g) \
-    -v ${ROOT_DIR}:/source:ro \
-    -v ${ROOT_DIR}/docker-build:/target:rw \
-    debian-stable-python-build \
-    bash /source/Resources/Builders/LinuxStandardBase/docker-internal.sh $1
-
-ls -lR ${ROOT_DIR}/docker-build/
--- a/Resources/Builders/LinuxStandardBase/docker-internal.sh	Tue Mar 31 10:48:49 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -ex
-
-mkdir /tmp/build
-cd /tmp/build
-
-cmake /source \
-      -DCMAKE_BUILD_TYPE=$1 \
-      -DPYTHON_VERSION=3.7 \
-      -DSTATIC_BUILD=ON \
-      -DCMAKE_INSTALL_PREFIX=/target 
-
-make -j`nproc`
-
-if [ "$1" == "Release" ]; then
-    strip ./libOrthancPython.so
-fi
-
-make install