repositories
/
mbt-docker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix permission issue at npm link usage
[mbt-docker.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index 35e4cf7f93210e9efe5200ee62b2edb51ff11c0c..3dd48fa500256534275832de98f40551bcb07fa3 100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-24,7
+24,7
@@
RUN set -ex \
ADD http://aia.pki.co.sap.com/aia/SAP%20Global%20Root%20CA.crt \
/etc/ssl/certs/SAP_Global_Root_CA.crt
ADD http://aia.pki.co.sap.com/aia/SAP%20Global%20Root%20CA.crt \
/etc/ssl/certs/SAP_Global_Root_CA.crt
-ARG NODE_VERSION=16.1
8.1
+ARG NODE_VERSION=16.1
9.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
@@
-113,7
+113,10
@@
RUN set -ex \
ARG SAPMACHINE_VERSION=11.0.17
ARG SAPMACHINE_VERSION=11.0.17
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
+ENV JAVA_HOME /opt/jdk
+
+RUN ARCH=; SAPMACHINE_MAJOR_VERSION=$(echo ${SAPMACHINE_VERSION} | cut -d. -f1) \
+ && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
amd64) ARCH='amd64';; \
*) echo "unsupported architecture"; exit 1 ;; \
&& case "${dpkgArch##*-}" in \
amd64) ARCH='amd64';; \
*) echo "unsupported architecture"; exit 1 ;; \
@@
-132,13
+135,14
@@
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg \
&& echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \
&& apt-get update \
&& chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg \
&& echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \
&& apt-get update \
- && apt-get install -y sapmachine-$
(echo ${SAPMACHINE_VERSION} | cut -d. -f1)
-jdk=${SAPMACHINE_VERSION} --no-install-recommends \
+ && apt-get install -y sapmachine-$
{SAPMACHINE_MAJOR_VERSION}
-jdk=${SAPMACHINE_VERSION} --no-install-recommends \
&& rm -rf "$GNUPGHOME" /var/lib/apt/lists/* \
&& apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr \
&& rm -rf "$GNUPGHOME" /var/lib/apt/lists/* \
&& apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr \
+ && ln -s /usr/lib/jvm/sapmachine-${SAPMACHINE_MAJOR_VERSION} ${JAVA_HOME} \
# smoke test
# smoke test
- && java -
-
version
+ && java -version
-ARG MAVEN_VERSION=3.8.
6
+ARG MAVEN_VERSION=3.8.
7
ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
ENV MAVEN_HOME /usr/share/maven
ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
ENV MAVEN_HOME /usr/share/maven
@@
-167,7
+171,7
@@
RUN set -ex \
# smoke test
&& mvn --version
# smoke test
&& mvn --version
-ARG MBT_VERSION=1.2.
19
+ARG MBT_VERSION=1.2.
21
RUN set -ex \
&& npm install -g --registry=https://int.repositories.cloud.sap/artifactory/api/npm/build-releases-npm --unsafe-perm mbt@${MBT_VERSION} \
RUN set -ex \
&& npm install -g --registry=https://int.repositories.cloud.sap/artifactory/api/npm/build-releases-npm --unsafe-perm mbt@${MBT_VERSION} \
@@
-183,5
+187,11
@@
RUN set -ex \
# smoke test
&& python3 --version
# smoke test
&& python3 --version
+# Allow global npm packages install without sudo
+RUN set -ex \
+ && mkdir ${USER_HOME_DIR}/.npm-global \
+ && chown -R ${USER}:${USER} ${USER_HOME_DIR}
+ENV NPM_CONFIG_PREFIX ${USER_HOME_DIR}/.npm-global
+
WORKDIR /project
USER ${USER}
WORKDIR /project
USER ${USER}