@@ -24,27 +24,30 @@ version in Docker := "1.0"
2424organization := " com.codacy"
2525
2626val installAll =
27- s """ echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&
28- |apk --no-cache add bash wget ca-certificates git &&
29- |apk --no-cache add python &&
30- |apk --no-cache add 'python3>3.6.1' &&
31- |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python &&
32- |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3 &&
33- |python -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
34- |python3 -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
35- |python -m pip install pylint-common==0.2.2 &&
36- |python3 -m pip install pylint-common==0.2.2 &&
37- |python -m pip install pylint-celery==0.3 &&
38- |python3 -m pip install pylint-celery==0.3 &&
39- |python -m pip install SaltPyLint==2017.12.15 &&
40- |python3 -m pip install SaltPyLint==2017.12.15 &&
41- |python -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
42- |python3 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
43- |python -m pip uninstall -y pip &&
44- |python3 -m pip uninstall -y pip &&
45- |apk del wget ca-certificates git &&
46- |rm -rf /tmp/* &&
47- |rm -rf /var/cache/apk/* """ .stripMargin.replaceAll(System .lineSeparator(), " " )
27+ s """ apt-get update &&
28+ |apt-get -y install python python3 ca-certificates wget openjdk-8-jre-headless &&
29+ |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python &&
30+ |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3 &&
31+ |python -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
32+ |python3 -m pip install django==1.9.2 pylint-django==0.9.0 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
33+ |python -m pip install pylint-common==0.2.2 &&
34+ |python3 -m pip install pylint-common==0.2.2 &&
35+ |python -m pip install pylint-celery==0.3 &&
36+ |python3 -m pip install pylint-celery==0.3 &&
37+ |python -m pip install SaltPyLint==2017.12.15 &&
38+ |python3 -m pip install SaltPyLint==2017.12.15 &&
39+ |python -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
40+ |python3 -m pip install pylint==1.8.2 --upgrade --ignore-installed --no-cache-dir &&
41+ |python -m pip uninstall -y pip &&
42+ |python3 -m pip uninstall -y pip &&
43+ |apt-get clean &&
44+ |rm -rf /var/lib/apt/lists/* &&
45+ |rm -rf /root/.cache/pip &&
46+ |rm -rf /root/.pip/cache &&
47+ |rm -rf /var/lib/apt/lists/* &&
48+ |rm -rf /var/cache/apt &&
49+ |rm -rf /var/cache/oracle-jdk8-installer &&
50+ |rm -rf /tmp/* """ .stripMargin.replaceAll(System .lineSeparator(), " " )
4851
4952mappings in Universal <++= (resourceDirectory in Compile ) map { (resourceDir : File ) =>
5053 val src = resourceDir / " docs"
@@ -63,15 +66,15 @@ daemonUser in Docker := dockerUser
6366
6467daemonGroup in Docker := dockerGroup
6568
66- dockerBaseImage := " develar/java "
69+ dockerBaseImage := " ubuntu:16.04 "
6770
6871dockerCommands := dockerCommands.value.flatMap {
6972 case cmd@ Cmd (" WORKDIR" , _) => List (cmd,
7073 Cmd (" RUN" , installAll)
7174 )
7275 case cmd@ (Cmd (" ADD" , " opt /opt" )) => List (cmd,
7376 Cmd (" RUN" , " mv /opt/docker/docs /docs" ),
74- Cmd (" RUN" , s " adduser -u 2004 -D $dockerUser " ),
77+ Cmd (" RUN" , " adduser --uid 2004 --disabled-password --gecos \"\" docker " ),
7578 ExecCmd (" RUN" , Seq (" chown" , " -R" , s " $dockerUser: $dockerGroup" , " /docs" ): _* )
7679 )
7780 case other => List (other)
0 commit comments