diff --git a/Dockerfile b/Dockerfile index 57fc167..43f1483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,6 @@ RUN useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ -c "Default Application User" default && \ chown -R 1001:0 ${APP_ROOT} -COPY ./s2i/bin /usr/libexec/s2i +COPY bin /usr/libexec/s2i USER 1001 diff --git a/Jenkinsfile b/Jenkinsfile index 50d0028..44cc659 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('build and tag image') { steps { container('base') { - sh '''cd .. && + sh ''' wget -O s2i.tar.gz https://github.com/openshift/source-to-image/releases/download/v1.1.13/source-to-image-v1.1.13-b54d75d3-linux-amd64.tar.gz \ && tar -xvf s2i.tar.gz \ && cp ./s2i /usr/local/bin''' diff --git a/s2i/bin/assemble b/bin/assemble similarity index 100% rename from s2i/bin/assemble rename to bin/assemble diff --git a/s2i/bin/run b/bin/run similarity index 100% rename from s2i/bin/run rename to bin/run